jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-30 06:06:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8582 from heitbaum/addon

Browse Source 
system-tools: update addon (3) and docker: update to 25.0.2 and addon (4)
This commit is contained in:
Christian Hewitt 2024-02-04 12:13:55 +04:00 committed by GitHub
commit 305de941ca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 174 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/addons/addon-depends/docker/cli/package.mk
View File

@ -3,7 +3,7 @@
PKG_NAME="cli"
PKG_VERSION="$(get_pkg_version moby)"
PKG_SHA256="029e86152ebfc44fa5038ce4f674db46133f5a458140a2cefa32933378a44557"
PKG_SHA256="1c287a8fd316384c0daf923c1cd9634a0a7a0477b7b3c9595847fb0ce84945d0"
PKG_LICENSE="ASL"
PKG_SITE="https://github.com/docker/cli"
PKG_URL="https://github.com/docker/cli/archive/v${PKG_VERSION}.tar.gz"

6
packages/addons/addon-depends/docker/containerd/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="containerd"
PKG_VERSION="1.7.12"
PKG_SHA256="bf523aa866d1152403807708b1239ee9b992c1afd526df0a83e744ce67a1f98e"
PKG_VERSION="1.7.13"
PKG_SHA256="ae2b914bff0ddbb9b29d5fc689a51e1ce89ea4edfc4df9ae10517c6f5d2d5aaf"
PKG_LICENSE="APL"
PKG_SITE="https://containerd.io"
PKG_URL="https://github.com/containerd/containerd/archive/v${PKG_VERSION}.tar.gz"
@ -13,7 +13,7 @@ PKG_LONGDESC="A daemon to control runC, built for performance and density."
PKG_TOOLCHAIN="manual"
# Git commit of the matching release https://github.com/containerd/containerd/releases
PKG_GIT_COMMIT="71909c1814c544ac47ab91d2e8b84718e517bb99"
export PKG_GIT_COMMIT="7c3aca7a610df76212171d200ca3811ff6096eb8"
pre_make_target() {

2
packages/addons/addon-depends/docker/ctop/package.mk
View File

@ -12,7 +12,7 @@ PKG_LONGDESC="Top-like interface for container metrics"
PKG_TOOLCHAIN="manual"
# Git commit of the matching release https://github.com/bcicen/ctop/releases
PKG_GIT_COMMIT="11a1cb10f416b4ca5e36c22c1acc2d11dbb24fb4"
export PKG_GIT_COMMIT="11a1cb10f416b4ca5e36c22c1acc2d11dbb24fb4"
pre_make_target() {
go_configure

6
packages/addons/addon-depends/docker/moby/package.mk
View File

@ -2,8 +2,8 @@
# Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="moby"
PKG_VERSION="25.0.1"
PKG_SHA256="4c15026828fd127a80ee5c4e96912599d4c6914f45a259bf3f8ac81c5bc9d7c0"
PKG_VERSION="25.0.2"
PKG_SHA256="01035c24231d1c4dac0355e6f48e496439bf2ead33d0d116739414eb1f8cbc44"
PKG_LICENSE="ASL"
PKG_SITE="https://mobyproject.org/"
PKG_URL="https://github.com/moby/moby/archive/v${PKG_VERSION}.tar.gz"
@ -12,7 +12,7 @@ PKG_LONGDESC="Moby is an open-source project created by Docker to enable and acc
PKG_TOOLCHAIN="manual"
# Git commit of the matching release https://github.com/moby/moby
export PKG_GIT_COMMIT="71fa3ab079ec13d17257f86fa92db8d7f24802f1"
export PKG_GIT_COMMIT="fce6e0ca9bc000888de3daa157af14fa41fcd0ff"
PKG_MOBY_BUILDTAGS="daemon \
autogen \

6
packages/addons/addon-depends/runc/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="runc"
PKG_VERSION="1.1.11"
PKG_SHA256="129ad7cd470e4bdc82cdd3d5f0aa93e43674bf8ea115da2b42a27361885fe3ee"
PKG_VERSION="1.1.12"
PKG_SHA256="be31b07d6a54a8f234016501c300ad04b6c428c56588e7eca8c3b663308db208"
PKG_LICENSE="APL"
PKG_SITE="https://github.com/opencontainers/runc"
PKG_URL="https://github.com/opencontainers/runc/archive/v${PKG_VERSION}.tar.gz"
@ -13,7 +13,7 @@ PKG_LONGDESC="A CLI tool for spawning and running containers according to the OC
PKG_TOOLCHAIN="manual"
# Git commit of the matching release https://github.com/opencontainers/runc/releases
PKG_GIT_COMMIT="4bccb38cc9cf198d52bebf2b3a90cd14e7af8c06"
export PKG_GIT_COMMIT="51d5e94601ceffbbd85688df1c928ecccbfa4685"
pre_make_target() {
go_configure

6
packages/addons/addon-depends/system-tools-depends/depends/efivar/package.mk
View File

@ -2,8 +2,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="efivar"
PKG_VERSION="b920a6ca82250504167066d24aa8731ad29a0de8" # 10 Dec 2021
PKG_SHA256="def327792854bdb5bc442e2907e1871c954e55e33d67045dcd2d2988f8a08afd"
PKG_VERSION="39"
PKG_SHA256="c9edd15f2eeeea63232f3e669a48e992c7be9aff57ee22672ac31f5eca1609a6"
PKG_ARCH="x86_64"
PKG_LICENSE="LGPL"
PKG_SITE="https://github.com/rhboot/efivar"
@ -27,7 +27,7 @@ pre_make_target() {
}
make_target() {
make CROSS_COMPILE=${TARGET_NAME}- -C src/ libefivar.a libefiboot.a efivar.h efivar
make CROSS_COMPILE=${TARGET_NAME}- -C src/ libefivar.a libefiboot.a efivar.h efivar-static
}
makeinstall_host() {

13
packages/addons/addon-depends/system-tools-depends/depends/efivar/patches/efivar-01-compile-with-glibc-2.36.patch
View File

@ -1,13 +0,0 @@
--- a/src/util.h 2022-01-14 19:29:35.000000000 +0000
+++ b/src/util.h 2022-07-19 09:43:36.718759307 +0000
@@ -23,7 +23,9 @@
#include <stdio.h>
#include <string.h>
#include <sys/ioctl.h>
-#include <sys/mount.h>
+#define BLKGETSIZE _IO(0x12, 96) /* Return device size. */
+#define BLKSSZGET _IO(0x12,104) /* Get block device sector size. */
+#define BLKGETSIZE64 _IOR(0x12,114,size_t) /* return device size. */
#include <sys/stat.h>
#include <sys/types.h>
#include <tgmath.h>

11
packages/addons/addon-depends/system-tools-depends/depends/efivar/patches/efivar-01-static_lib.patch
View File

@ -1,11 +0,0 @@
--- a/src/Makefile 2018-10-01 21:30:06.000000000 +0200
+++ b/src/Makefile 2018-10-17 14:16:46.000000000 +0200
@@ -93,7 +93,7 @@
libefivar.so : LIBS=dl
libefivar.so : MAP=libefivar.map
-efivar : $(EFIVAR_OBJECTS) | libefivar.so
+efivar : $(EFIVAR_OBJECTS) | libefivar.a
efivar : LIBS=efivar dl
efivar-static : $(EFIVAR_OBJECTS) $(patsubst %.o,%.static.o,$(LIBEFIVAR_OBJECTS))

4
packages/addons/addon-depends/system-tools-depends/efibootmgr/package.mk
View File

@ -2,8 +2,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="efibootmgr"
PKG_VERSION="18"
PKG_SHA256="442867d12f8525034a404fc8af3036dba8e1fc970998af2486c3b940dfad0874"
PKG_VERSION="0ca99d442e9d0a49d3ec373413d781ca392b57bc"
PKG_SHA256="da746a00b0f263ec87e495a54fb00be84e7b8e7fc3d3f949f2545c97a1b3dff9"
PKG_ARCH="x86_64"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/rhboot/efibootmgr"

150
packages/addons/addon-depends/system-tools-depends/efibootmgr/patches/efibootmgr-0001-Revert-Implement-uri-option-for-use-with-ifname.patch Normal file
View File

@ -0,0 +1,150 @@
From ef1e3502c9431a789a6b2c4a3e9290b6a4611e6f Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Fri, 2 Feb 2024 11:50:56 +0000
Subject: [PATCH] Revert "Implement --uri option for use with --ifname"
This reverts commit 5ce076c88670eeb63dea80fcaec60e79f0e57ac6.
---
efibootmgr.spec.in | 2 +-
src/efi.c | 47 +++++++++++++++++++---------------------
src/efibootmgr.c | 9 +-------
src/include/efibootmgr.h | 1 -
4 files changed, 24 insertions(+), 35 deletions(-)
diff --git a/efibootmgr.spec.in b/efibootmgr.spec.in
index ec90e2a..f20e405 100644
--- a/efibootmgr.spec.in
+++ b/efibootmgr.spec.in
@@ -6,7 +6,7 @@ Group: System Environment/Base
License: GPLv2+
URL: https://github.com/rhboot/%{name}/
BuildRequires: git, popt-devel
-BuildRequires: efivar-libs >= 39-1, efivar-devel >= 39-1
+BuildRequires: efivar-libs >= 30-1, efivar-devel >= 30-1
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXXX)
# EFI/UEFI don't exist on PPC
ExclusiveArch: %{ix86} x86_64 aarch64 arm
diff --git a/src/efi.c b/src/efi.c
index 26a3211..4302b5c 100644
--- a/src/efi.c
+++ b/src/efi.c
@@ -174,40 +174,37 @@ make_linux_load_option(uint8_t **data, size_t *data_size,
efidp dp = NULL;
if (opts.iface && opts.ip_version == EFIBOOTMGR_IPV4) {
- needed = efi_generate_ipv4_device_path_with_uri(
- NULL, 0, opts.iface,
- opts.local_ip_addr,
- opts.remote_ip_addr,
- opts.gateway_ip_addr,
- opts.ip_netmask,
- opts.ip_local_port,
- opts.ip_remote_port,
- opts.ip_protocol,
- opts.ip_addr_origin,
- opts.uri);
+ needed = efi_generate_ipv4_device_path(NULL, 0, opts.iface,
+ opts.local_ip_addr,
+ opts.remote_ip_addr,
+ opts.gateway_ip_addr,
+ opts.ip_netmask,
+ opts.ip_local_port,
+ opts.ip_remote_port,
+ opts.ip_protocol,
+ opts.ip_addr_origin);
if (needed < 0) {
- efi_error("efi_generate_ipv4_device_path_with_uri() = %zd (failed)",
+ efi_error("efi_generate_ipv4_device_path() = %zd (failed)",
needed);
return -1;
}
if (data_size && *data_size) {
dp = malloc(needed);
- needed = efi_generate_ipv4_device_path_with_uri(
- (uint8_t *)dp, needed,
- opts.iface,
- opts.local_ip_addr,
- opts.remote_ip_addr,
- opts.gateway_ip_addr,
- opts.ip_netmask,
- opts.ip_local_port,
- opts.ip_remote_port,
- opts.ip_protocol,
- opts.ip_addr_origin,
- opts.uri);
+ needed = efi_generate_ipv4_device_path(
+ (uint8_t *)dp, needed,
+ opts.iface,
+ opts.local_ip_addr,
+ opts.remote_ip_addr,
+ opts.gateway_ip_addr,
+ opts.ip_netmask,
+ opts.ip_local_port,
+ opts.ip_remote_port,
+ opts.ip_protocol,
+ opts.ip_addr_origin);
if (needed < 0) {
free(dp);
- efi_error("efi_generate_ipv4_device_path_with_uri() = %zd (failed)",
+ efi_error("efi_generate_ipv4_device_path() = %zd (failed)",
needed);
return -1;
}
diff --git a/src/efibootmgr.c b/src/efibootmgr.c
index 6f51d33..3ba4d1b 100644
--- a/src/efibootmgr.c
+++ b/src/efibootmgr.c
@@ -1410,9 +1410,8 @@ usage()
printf("\t-f | --reconnect Re-connect devices after driver is loaded.\n");
printf("\t-F | --no-reconnect Do not re-connect devices after driver is loaded.\n");
printf("\t-g | --gpt Force disk with invalid PMBR to be treated as GPT.\n");
- printf("\t-i | --iface name Create a netboot entry for the named interface (IPv4+DHCP support only).\n");
+ printf("\t-i | --iface name Create a netboot entry for the named interface.\n");
printf("\t-I | --index number When creating an entry, insert it in bootorder at specified position (default: 0).\n");
- printf("\t --uri Uri Specify an Uri (for use with --iface option).\n");
printf("\t-l | --loader name (Defaults to \""DEFAULT_LOADER"\").\n");
printf("\t-L | --label label Boot manager display label (defaults to \"Linux\").\n");
printf("\t-m | --mirror-below-4G t|f Mirror memory below 4GB.\n");
@@ -1483,7 +1482,6 @@ parse_opts(int argc, char **argv)
{"gpt", no_argument, 0, 'g'},
{"iface", required_argument, 0, 'i'},
{"index", required_argument, 0, 'I'},
- {"uri", required_argument, 0, 0},
{"keep", no_argument, 0, 'k'},
{"loader", required_argument, 0, 'l'},
{"label", required_argument, 0, 'L'},
@@ -1767,8 +1765,6 @@ parse_opts(int argc, char **argv)
opts.abbreviate_path != EFIBOOTMGR_PATH_ABBREV_FILE)
errx(41, "contradicting --full-dev-path/--file-dev-path/-e options");
opts.abbreviate_path = EFIBOOTMGR_PATH_ABBREV_FILE;
- } else if (!strcmp(long_options[option_index].name, "uri")) {
- opts.uri = optarg;
} else {
usage();
exit(1);
@@ -1811,9 +1807,6 @@ main(int argc, char **argv)
verbose = opts.verbose;
- if (opts.uri && !opts.iface)
- errx(25, "--uri is supported only with --iface option.");
-
if (opts.sysprep && opts.driver)
errx(25, "--sysprep and --driver may not be used together.");
diff --git a/src/include/efibootmgr.h b/src/include/efibootmgr.h
index 05e9216..dc2a48b 100644
--- a/src/include/efibootmgr.h
+++ b/src/include/efibootmgr.h
@@ -59,7 +59,6 @@ typedef struct {
uint16_t ip_remote_port;
uint16_t ip_protocol;
uint8_t ip_addr_origin;
- char *uri;
char *loader;
unsigned char *label;
--
2.43.0

4
packages/addons/addon-depends/system-tools-depends/fdupes/package.mk
View File

@ -2,8 +2,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="fdupes"
PKG_VERSION="2.2.1"
PKG_SHA256="846bb79ca3f0157856aa93ed50b49217feb68e1b35226193b6bc578be0c5698d"
PKG_VERSION="2.3.0"
PKG_SHA256="6170d64a7e565ee314cca4dd25a123e60aa1e3febb11e57078bebb9c1da7e019"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/adrianlopezroche/fdupes"
PKG_URL="https://github.com/adrianlopezroche/fdupes/releases/download/v${PKG_VERSION}/fdupes-${PKG_VERSION}.tar.gz"

4
packages/addons/addon-depends/system-tools-depends/mc/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="mc"
PKG_VERSION="4.8.30"
PKG_SHA256="5ebc3cb2144b970c5149fda556c4ad50b78780494696cdf2d14a53204c95c7df"
PKG_VERSION="4.8.31"
PKG_SHA256="24191cf8667675b8e31fc4a9d18a0a65bdc0598c2c5c4ea092494cd13ab4ab1a"
PKG_LICENSE="GPL"
PKG_SITE="http://www.midnight-commander.org"
PKG_URL="http://ftp.midnight-commander.org/mc-${PKG_VERSION}.tar.xz"

4
packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk
View File

@ -2,8 +2,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="stress-ng"
PKG_VERSION="0.17.04"
PKG_SHA256="60c37d8b1effc5772fb30f638e20b1de01e0488e274e283301c3fd6c707d8538"
PKG_VERSION="0.17.05"
PKG_SHA256="48964a0de5838acfed5c78d78d5f4a1d86974883d5537ccc55df019a0186a1b5"
PKG_LICENSE="GPLv2"
PKG_SITE="https://github.com/ColinIanKing/stress-ng"
PKG_URL="https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V${PKG_VERSION}.tar.gz"

2
packages/addons/service/docker/package.mk
View File

@ -3,7 +3,7 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="docker"
PKG_REV="3"
PKG_REV="4"
PKG_ARCH="any"
PKG_LICENSE="ASL"
PKG_SITE="http://www.docker.com/"

2
packages/addons/tools/system-tools/package.mk
View File

@ -3,7 +3,7 @@
PKG_NAME="system-tools"
PKG_VERSION="1.0"
PKG_REV="2"
PKG_REV="3"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://libreelec.tv"