From cbbef6a9d3571dc27245d62a7e87e8068b0f685f Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 15 Jul 2023 10:06:53 +0000 Subject: [PATCH 01/12] efibootmgr: update to githash 0ca99d4 and revert Implement --uri option for use with --ifname https://github.com/rhboot/efibootmgr/ 162 e103b202866251c4227e580a0774b718dc4ff619 --- .../efibootmgr/package.mk | 4 +- ...ement-uri-option-for-use-with-ifname.patch | 150 ++++++++++++++++++ 2 files changed, 152 insertions(+), 2 deletions(-) create mode 100644 packages/addons/addon-depends/system-tools-depends/efibootmgr/patches/efibootmgr-0001-Revert-Implement-uri-option-for-use-with-ifname.patch diff --git a/packages/addons/addon-depends/system-tools-depends/efibootmgr/package.mk b/packages/addons/addon-depends/system-tools-depends/efibootmgr/package.mk index eee38a9d30..dc272845cb 100644 --- a/packages/addons/addon-depends/system-tools-depends/efibootmgr/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/efibootmgr/package.mk @@ -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" diff --git a/packages/addons/addon-depends/system-tools-depends/efibootmgr/patches/efibootmgr-0001-Revert-Implement-uri-option-for-use-with-ifname.patch b/packages/addons/addon-depends/system-tools-depends/efibootmgr/patches/efibootmgr-0001-Revert-Implement-uri-option-for-use-with-ifname.patch new file mode 100644 index 0000000000..adeb7bb38e --- /dev/null +++ b/packages/addons/addon-depends/system-tools-depends/efibootmgr/patches/efibootmgr-0001-Revert-Implement-uri-option-for-use-with-ifname.patch @@ -0,0 +1,150 @@ +From ef1e3502c9431a789a6b2c4a3e9290b6a4611e6f Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +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 + From c6b331027241396480bd5880455132f5db4b1efa Mon Sep 17 00:00:00 2001 From: heitbaum Date: Fri, 14 Jan 2022 23:42:39 +0000 Subject: [PATCH 02/12] efivar: update to 39 release notes: - https://github.com/rhboot/efivar/releases/tag/38 - https://github.com/rhboot/efivar/releases/tag/39 --- .../system-tools-depends/depends/efivar/package.mk | 6 +++--- .../patches/efivar-01-compile-with-glibc-2.36.patch | 13 ------------- .../efivar/patches/efivar-01-static_lib.patch | 11 ----------- 3 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 packages/addons/addon-depends/system-tools-depends/depends/efivar/patches/efivar-01-compile-with-glibc-2.36.patch delete mode 100644 packages/addons/addon-depends/system-tools-depends/depends/efivar/patches/efivar-01-static_lib.patch diff --git a/packages/addons/addon-depends/system-tools-depends/depends/efivar/package.mk b/packages/addons/addon-depends/system-tools-depends/depends/efivar/package.mk index bb8cb19b8c..527749d85d 100644 --- a/packages/addons/addon-depends/system-tools-depends/depends/efivar/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/depends/efivar/package.mk @@ -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() { diff --git a/packages/addons/addon-depends/system-tools-depends/depends/efivar/patches/efivar-01-compile-with-glibc-2.36.patch b/packages/addons/addon-depends/system-tools-depends/depends/efivar/patches/efivar-01-compile-with-glibc-2.36.patch deleted file mode 100644 index a281f11add..0000000000 --- a/packages/addons/addon-depends/system-tools-depends/depends/efivar/patches/efivar-01-compile-with-glibc-2.36.patch +++ /dev/null @@ -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 - #include - #include --#include -+#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 - #include - #include diff --git a/packages/addons/addon-depends/system-tools-depends/depends/efivar/patches/efivar-01-static_lib.patch b/packages/addons/addon-depends/system-tools-depends/depends/efivar/patches/efivar-01-static_lib.patch deleted file mode 100644 index 74d0bb8952..0000000000 --- a/packages/addons/addon-depends/system-tools-depends/depends/efivar/patches/efivar-01-static_lib.patch +++ /dev/null @@ -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)) From 8f17b265367b7c988aff7e65c60806aebec8ad81 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 28 Jan 2024 01:36:01 +0000 Subject: [PATCH 03/12] mc: update to 4.8.31 news: - http://midnight-commander.org/wiki/NEWS-4.8.31 --- .../addons/addon-depends/system-tools-depends/mc/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/system-tools-depends/mc/package.mk b/packages/addons/addon-depends/system-tools-depends/mc/package.mk index 8ae627e3fc..72e6f70630 100644 --- a/packages/addons/addon-depends/system-tools-depends/mc/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/mc/package.mk @@ -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" From c2913b5fe5501f0cf323b3e1e8e3c5db2b68ef94 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 29 Jan 2024 11:20:15 +0000 Subject: [PATCH 04/12] fdupes: update to 2.3.0 --- .../addon-depends/system-tools-depends/fdupes/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/system-tools-depends/fdupes/package.mk b/packages/addons/addon-depends/system-tools-depends/fdupes/package.mk index 25a3b63e53..afa0461339 100644 --- a/packages/addons/addon-depends/system-tools-depends/fdupes/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/fdupes/package.mk @@ -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" From 87e232353676bbd60893df9650695cc0d95ba4e2 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 2 Feb 2024 12:52:49 +0000 Subject: [PATCH 05/12] stress-ng: update to 0.17.05 --- .../addon-depends/system-tools-depends/stress-ng/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk b/packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk index 2bcceaa2a4..003b27bd3e 100644 --- a/packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk @@ -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" From 621dce5061efe9dae5242b271261f3cc5e1ad41c Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 3 Feb 2024 09:50:08 +0000 Subject: [PATCH 06/12] system-tools: update addon (3) - stress-ng: update to 0.17.05 - fdupes: update to 2.3.0 - mc: update to 4.8.31 - efibootmgr: update to githash 0ca99d4 - efivar: update to 39 --- packages/addons/tools/system-tools/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/tools/system-tools/package.mk b/packages/addons/tools/system-tools/package.mk index beba9a4b09..005171c95e 100644 --- a/packages/addons/tools/system-tools/package.mk +++ b/packages/addons/tools/system-tools/package.mk @@ -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" From 7a1d00ef61910fdca909f46fb4659e06a679c905 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 1 Feb 2024 12:07:16 +0000 Subject: [PATCH 07/12] containerd: update to 1.7.13 --- packages/addons/addon-depends/docker/containerd/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/addons/addon-depends/docker/containerd/package.mk b/packages/addons/addon-depends/docker/containerd/package.mk index 2e1c1ea067..17745e21ad 100644 --- a/packages/addons/addon-depends/docker/containerd/package.mk +++ b/packages/addons/addon-depends/docker/containerd/package.mk @@ -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() { From 2c5f0eda82f5831260afd278716855bf73338cc4 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 2 Feb 2024 08:08:50 +0000 Subject: [PATCH 08/12] runc: update to 1.1.12 --- packages/addons/addon-depends/runc/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/addons/addon-depends/runc/package.mk b/packages/addons/addon-depends/runc/package.mk index 68d5d5769b..6441090cbb 100644 --- a/packages/addons/addon-depends/runc/package.mk +++ b/packages/addons/addon-depends/runc/package.mk @@ -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 From 4ab69f42088ca3e35e42dce85b9b43612668d799 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 1 Feb 2024 12:07:40 +0000 Subject: [PATCH 09/12] moby: update to 25.0.2 --- packages/addons/addon-depends/docker/moby/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/addons/addon-depends/docker/moby/package.mk b/packages/addons/addon-depends/docker/moby/package.mk index ac705ca6b6..812b53ac34 100644 --- a/packages/addons/addon-depends/docker/moby/package.mk +++ b/packages/addons/addon-depends/docker/moby/package.mk @@ -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 \ From e5654df2238f7e07bbc4540582e7c0b6b0f3315f Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 1 Feb 2024 12:07:42 +0000 Subject: [PATCH 10/12] cli: update to 25.0.2 --- packages/addons/addon-depends/docker/cli/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/addon-depends/docker/cli/package.mk b/packages/addons/addon-depends/docker/cli/package.mk index e9fae872ec..877125c13f 100644 --- a/packages/addons/addon-depends/docker/cli/package.mk +++ b/packages/addons/addon-depends/docker/cli/package.mk @@ -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" From 8ff8030f16bcefd4763d7b0c207e9cc0f18aa52e Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 3 Feb 2024 23:34:36 +0000 Subject: [PATCH 11/12] ctop: update package.mk --- packages/addons/addon-depends/docker/ctop/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/addon-depends/docker/ctop/package.mk b/packages/addons/addon-depends/docker/ctop/package.mk index b05d184c57..e7292c0e15 100644 --- a/packages/addons/addon-depends/docker/ctop/package.mk +++ b/packages/addons/addon-depends/docker/ctop/package.mk @@ -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 From a91c337644a4f3edf82e07768d9a7fbce3474b78 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 3 Feb 2024 23:49:31 +0000 Subject: [PATCH 12/12] docker: update to 25.0.2 and addon (4) - cli: update to 25.0.2 - containerd: update to 1.7.13 - ctop: update package.mk - moby: update to 25.0.2 - runc: update to 1.1.12 --- packages/addons/service/docker/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk index 85e601603a..106401b844 100644 --- a/packages/addons/service/docker/package.mk +++ b/packages/addons/service/docker/package.mk @@ -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/"