From ea10a18bb84396e499bd6105975e245bafe6c0e0 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 8 Nov 2024 07:44:23 +0000 Subject: [PATCH 1/4] go: update to 1.23.3 --- packages/addons/addon-depends/go/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/go/package.mk b/packages/addons/addon-depends/go/package.mk index b0fefc20e4..908278c0dd 100644 --- a/packages/addons/addon-depends/go/package.mk +++ b/packages/addons/addon-depends/go/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="go" -PKG_VERSION="1.23.2" -PKG_SHA256="fc3448a68fca887ceb0e0d4357d0ecd05d54a78e052f8667b283e745c87e7f2e" +PKG_VERSION="1.23.3" +PKG_SHA256="a179458ab932cbc54a75db1a9f239216c083902db554fcffe0546b7df2235f10" PKG_LICENSE="BSD" PKG_SITE="https://golang.org" PKG_URL="https://github.com/golang/go/archive/${PKG_NAME}${PKG_VERSION}.tar.gz" From d537bf27fb8bdc9ae7fdea9d5e6da214cc2f0012 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 3 Nov 2024 10:49:52 +0000 Subject: [PATCH 2/4] runc: update to 1.2.1 --- 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 10c9e2ab3b..e783658633 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.2.0" -PKG_SHA256="25072beb84f4adae316a968241dc74ac30982d38e4459635074aa9e9d87d3de7" +PKG_VERSION="1.2.1" +PKG_SHA256="1418fdaf46e0d6da75b62b4ad788fb9bccbe8a1b6318675205bf27cc03a02427" 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 -export PKG_GIT_COMMIT="0b9fa21be2bcba45f6d9d748b4bcf70cfbffbc19" +export PKG_GIT_COMMIT="d7735e388ef5eecbd60d93bfbe5afe0f3fbc8a6b" pre_make_target() { go_configure From 0faff6eabc20dd6b8761889c7ab42bdd3dbc3f49 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 8 Nov 2024 07:54:12 +0000 Subject: [PATCH 3/4] containerd: update to 2.0.0 release notes: - https://github.com/containerd/containerd/releases/tag/v2.0.0 readme: - https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md --- .../addon-depends/docker/containerd/package.mk | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/addons/addon-depends/docker/containerd/package.mk b/packages/addons/addon-depends/docker/containerd/package.mk index d9acbd5ebd..9278ff05dc 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.23" -PKG_SHA256="393bfde8ca1766a0bca3441e18eddc3f5a5c8d97ef676bde0d6c9903e1b0ec0c" +PKG_VERSION="2.0.0" +PKG_SHA256="346d644e1b96e1f4a39bfe9d1eb0eb01ca676f806c12d95e5dbe35325bbc1780" 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 -export PKG_GIT_COMMIT="57f17b0a6295a39009d861b89e3b3b87b005ca27" +export PKG_GIT_COMMIT="207ad711eabd375a01713109a8a197d197ff6542" pre_make_target() { @@ -21,7 +21,7 @@ pre_make_target() { export CONTAINERD_VERSION="${PKG_VERSION}" export CONTAINERD_REVISION="${PKG_GIT_COMMIT}" - export CONTAINERD_PKG="github.com/containerd/containerd" + export CONTAINERD_PKG="github.com/containerd/containerd/v2" export LDFLAGS="-w -extldflags -static -X ${CONTAINERD_PKG}/version.Version=${CONTAINERD_VERSION} -X ${CONTAINERD_PKG}/version.Revision=${CONTAINERD_REVISION} -X ${CONTAINERD_PKG}/version.Package=${CONTAINERD_PKG} -extld ${CC}" export GO111MODULE=off @@ -31,13 +31,12 @@ pre_make_target() { fi mv ${GOPATH}/src/github.com/containerd/containerd/api ${PKG_BUILD}/api-vendor-duplicate - rmdir ${GOPATH}/src/github.com/containerd/containerd - ln -fs ${PKG_BUILD} ${GOPATH}/src/github.com/containerd/containerd + ln -fs ${PKG_BUILD} ${GOPATH}/src/github.com/containerd/containerd/v2 + ln -fs ${PKG_BUILD}/api ${GOPATH}/src/github.com/containerd/containerd/api } make_target() { mkdir -p bin ${GOLANG} build -v -o bin/containerd -a -tags "static_build no_btrfs" -ldflags "${LDFLAGS}" ./cmd/containerd - ${GOLANG} build -v -o bin/containerd-shim -a -tags "static_build no_btrfs" -ldflags "${LDFLAGS}" ./cmd/containerd-shim ${GOLANG} build -v -o bin/containerd-shim-runc-v2 -a -tags "static_build no_btrfs" -ldflags "${LDFLAGS}" ./cmd/containerd-shim-runc-v2 } From 07fac58c14139998596f2c738a52a9a3ffd3f3d3 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 8 Nov 2024 08:49:34 +0000 Subject: [PATCH 4/4] docker: update to containerd 2.0.0 and addon (3) - containerd: update to 2.0.0 - runc: update to 1.2.1 - go: update to 1.23.3 --- packages/addons/service/docker/package.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk index 92dc961a70..c9328ad4a4 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="2" +PKG_REV="3" PKG_ARCH="any" PKG_LICENSE="ASL" PKG_SITE="http://www.docker.com/" @@ -29,7 +29,6 @@ addon() { # containerd cp -P $(get_build_dir containerd)/bin/containerd ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/containerd - cp -P $(get_build_dir containerd)/bin/containerd-shim ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/containerd-shim cp -P $(get_build_dir containerd)/bin/containerd-shim-runc-v2 ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/containerd-shim-runc-v2 # ctop