From a9bd60a1bb0287d4a04e5ffe10f81245df5bd3e0 Mon Sep 17 00:00:00 2001 From: sujanas Date: Tue, 30 Dec 2025 08:56:09 +0000 Subject: [PATCH 1/9] Update containerd version from 1.7.28 to 1.7.30 --- prepare_source | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/prepare_source b/prepare_source index 752f828..3983f39 100644 --- a/prepare_source +++ b/prepare_source @@ -1,11 +1,11 @@ -git_src --branch v1.7.28 https://github.com/containerd/containerd +git_src --branch v1.7.30 https://github.com/containerd/containerd # debian specific things crd=$(mktemp -d) git clone https://salsa.debian.org/go-team/packages/containerd.git $crd pushd $crd #git checkout debian/1.7.24_ds1-6 -git checkout 7d9c32230c3fef2e3e12a8c689244d9799580e66 +git checkout 5e72d13e5ef9facd3f8398b4bbc29c188f285569 cp -r debian "$dir/src/" popd rm -rf "$crd" @@ -17,8 +17,8 @@ apply_patches cp -r upstream_patches/remove-limitnofile.patch "$dir/src/debian/patches/" echo remove-limitnofile.patch >> "$dir/src/debian/patches/series" -version="1.7.28-0" -message="Update to 1.7.28-0" +version="1.7.30-0" +message="Update to 1.7.30-0" version_suffix=gl0~bp1592 From 08bf88b3c72c117c0de6943095d5ad32cb3e46fc Mon Sep 17 00:00:00 2001 From: sujanas Date: Tue, 30 Dec 2025 09:32:37 +0000 Subject: [PATCH 2/9] Update patch --- patches/debian.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/debian.patch b/patches/debian.patch index 8c6eb88..a6e31b2 100644 --- a/patches/debian.patch +++ b/patches/debian.patch @@ -71,9 +71,9 @@ index 9e0e4a3da..9f2fa3284 100644 - golang-k8s-utils-dev, - golang-opentelemetry-otel-dev (>> 1.31), - golang-tags.cncf-container-device-interface-dev - Standards-Version: 4.6.2 - Rules-Requires-Root: no + Standards-Version: 4.7.2 Homepage: https://containerd.io/ + Vcs-Git: https://salsa.debian.org/go-team/packages/containerd.git diff --git a/debian/rules b/debian/rules index 6ed2d9483..c07502763 100755 --- a/debian/rules From ce2f64f158935fd6d2c2fd88dafe9311583c6ac0 Mon Sep 17 00:00:00 2001 From: sujanas Date: Tue, 30 Dec 2025 14:56:40 +0000 Subject: [PATCH 3/9] Update debian version --- prepare_source | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prepare_source b/prepare_source index 3983f39..e906532 100644 --- a/prepare_source +++ b/prepare_source @@ -5,7 +5,7 @@ crd=$(mktemp -d) git clone https://salsa.debian.org/go-team/packages/containerd.git $crd pushd $crd #git checkout debian/1.7.24_ds1-6 -git checkout 5e72d13e5ef9facd3f8398b4bbc29c188f285569 +git checkout 44dd36e81027f86f4894819e42e3bc00fc02714e cp -r debian "$dir/src/" popd rm -rf "$crd" From 1259227ddec83bd89979188d24d174772b7436bf Mon Sep 17 00:00:00 2001 From: sujanas Date: Tue, 30 Dec 2025 15:48:11 +0000 Subject: [PATCH 4/9] Remove build dependencies since it is outdated --- .github/workflows/build.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fea1011..9b7698e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,9 +10,3 @@ jobs: release: ${{ github.ref == 'refs/heads/main' }} build_dep: | gardenlinux/package-golang 1.24.4-1gl0+bp1592 - gardenlinux/bp-package-golang-golang-x-net-dev 0.27.0-2gl2+bp1592 - gardenlinux/bp-package-golang-net 0.33.0-1gl1+bp1592 - gardenlinux/bp-package-golang-x-crypto 0.36.0-1+exp1gl2+bp1592 - gardenlinux/bp-package-golang-golang-x-sys-dev 0.22.0-1gl1+bp1592 - gardenlinux/bp-package-golang-golang-x-term-dev 0.22.0-1gl1+bp1592 - gardenlinux/bp-package-golang-golang-x-text-dev 0.16.0-1gl1+bp1592 From f71dd4a545c675add53a6fdf4954db6439d3b73a Mon Sep 17 00:00:00 2001 From: Sujana Subramaniam Date: Fri, 2 Jan 2026 14:20:28 +0100 Subject: [PATCH 5/9] Update patch for latest debian --- patches/debian.patch | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/patches/debian.patch b/patches/debian.patch index a6e31b2..e7319b2 100644 --- a/patches/debian.patch +++ b/patches/debian.patch @@ -1,11 +1,12 @@ diff --git a/debian/control b/debian/control -index 9e0e4a3da..9f2fa3284 100644 +index 18a56565c..6fdd1dd08 100644 --- a/debian/control +++ b/debian/control -@@ -10,71 +10,7 @@ Build-Depends: debhelper-compat (= 13), +@@ -9,72 +9,7 @@ Uploaders: Tianon Gravi , + Build-Depends: debhelper-compat (= 13), dh-golang, go-md2man, - golang-any, +- golang-any, - golang-github-blang-semver-dev, - golang-github-container-orchestrated-devices-container-device-interface-dev (>= 0.8.0~), - golang-github-containerd-btrfs-dev (>= 2), @@ -75,7 +76,7 @@ index 9e0e4a3da..9f2fa3284 100644 Homepage: https://containerd.io/ Vcs-Git: https://salsa.debian.org/go-team/packages/containerd.git diff --git a/debian/rules b/debian/rules -index 6ed2d9483..c07502763 100755 +index 6bc612c7a..d01d5dff5 100755 --- a/debian/rules +++ b/debian/rules @@ -17,6 +17,7 @@ EXTRA_EXCLUDES += vendor @@ -86,6 +87,16 @@ index 6ed2d9483..c07502763 100755 %: dh $@ --buildsystem=golang --with=golang --builddirectory=_build +@@ -48,9 +49,4 @@ endif + override_dh_auto_install: + DH_GOLANG_EXCLUDES="$(EXCLUDES) $(EXTRA_EXCLUDES)" dh_auto_install + +-execute_after_dh_install-indep: +- # now move the gprc api definitions to its own package +- mkdir -pv debian/golang-github-containerd-containerd-api-dev/usr/share/gocode/src/github.com/containerd/containerd/ +- mv -v debian/golang-github-containerd-containerd-dev/usr/share/gocode/src/github.com/containerd/containerd/api \ +- debian/golang-github-containerd-containerd-api-dev/usr/share/gocode/src/github.com/containerd/containerd/ + diff --git a/debian/copyright b/debian/copyright index 6348f3854..658fe78a0 100644 --- a/debian/copyright From fc2c7a2a04b76d74278a384c6b195a3549c95401 Mon Sep 17 00:00:00 2001 From: Sujana Subramaniam Date: Fri, 2 Jan 2026 14:24:27 +0100 Subject: [PATCH 6/9] Change build dependency to use go 1.25 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9b7698e..f3a9a07 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,4 +9,4 @@ jobs: with: release: ${{ github.ref == 'refs/heads/main' }} build_dep: | - gardenlinux/package-golang 1.24.4-1gl0+bp1592 + gardenlinux/package-golang 1.25.3-1gl0+bp1592 From 3a5eb865d1fff968868724bddecb48eccbcc3407 Mon Sep 17 00:00:00 2001 From: Sujana Subramaniam Date: Fri, 2 Jan 2026 14:34:57 +0100 Subject: [PATCH 7/9] Add export golang path --- prepare_binary | 1 + 1 file changed, 1 insertion(+) create mode 100644 prepare_binary diff --git a/prepare_binary b/prepare_binary new file mode 100644 index 0000000..cae7004 --- /dev/null +++ b/prepare_binary @@ -0,0 +1 @@ +export PATH=$PATH:/usr/lib/go-1.25/bin From 2985c9ee92f575f0971d5cb216ca3c042592e861 Mon Sep 17 00:00:00 2001 From: Sujana Subramaniam Date: Fri, 2 Jan 2026 15:09:36 +0100 Subject: [PATCH 8/9] Build with golang 1.24 --- .github/workflows/build.yml | 2 +- patches/debian.patch | 5 +++-- prepare_binary | 3 ++- prepare_source | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f3a9a07..9b7698e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,4 +9,4 @@ jobs: with: release: ${{ github.ref == 'refs/heads/main' }} build_dep: | - gardenlinux/package-golang 1.25.3-1gl0+bp1592 + gardenlinux/package-golang 1.24.4-1gl0+bp1592 diff --git a/patches/debian.patch b/patches/debian.patch index e7319b2..76588ee 100644 --- a/patches/debian.patch +++ b/patches/debian.patch @@ -1,8 +1,8 @@ diff --git a/debian/control b/debian/control -index 18a56565c..6fdd1dd08 100644 +index 18a56565c..0d1f34c7c 100644 --- a/debian/control +++ b/debian/control -@@ -9,72 +9,7 @@ Uploaders: Tianon Gravi , +@@ -9,72 +9,8 @@ Uploaders: Tianon Gravi , Build-Depends: debhelper-compat (= 13), dh-golang, go-md2man, @@ -55,6 +55,7 @@ index 18a56565c..6fdd1dd08 100644 - golang-github-sirupsen-logrus-dev, - golang-github-spf13-pflag-dev, - golang-github-tchap-go-patricia-dev, ++ golang-1.24-go, golang-github-urfave-cli-dev (>= 1.22.2-4~), - golang-github-vishvananda-netlink-dev, - golang-go-zfs-dev, diff --git a/prepare_binary b/prepare_binary index cae7004..5282121 100644 --- a/prepare_binary +++ b/prepare_binary @@ -1 +1,2 @@ -export PATH=$PATH:/usr/lib/go-1.25/bin +update-alternatives --install /usr/bin/go go /usr/lib/go-1.24/bin/go 50 +update-alternatives --install /usr/bin/gofmt gofmt /usr/lib/go-1.24/bin/gofmt 50 diff --git a/prepare_source b/prepare_source index e906532..baccb05 100644 --- a/prepare_source +++ b/prepare_source @@ -4,8 +4,8 @@ git_src --branch v1.7.30 https://github.com/containerd/containerd crd=$(mktemp -d) git clone https://salsa.debian.org/go-team/packages/containerd.git $crd pushd $crd -#git checkout debian/1.7.24_ds1-6 -git checkout 44dd36e81027f86f4894819e42e3bc00fc02714e +#git checkout debian/1.7.24_ds1-10 +git checkout 5e72d13e5ef9facd3f8398b4bbc29c188f285569 cp -r debian "$dir/src/" popd rm -rf "$crd" From 17d2e8b39387d10443c201ad5f4b7869f5c7ffea Mon Sep 17 00:00:00 2001 From: Sujana Subramaniam Date: Wed, 7 Jan 2026 10:55:48 +0100 Subject: [PATCH 9/9] Use golang version 1.24.9 for containerd build env --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9b7698e..1ce9b20 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,4 +9,4 @@ jobs: with: release: ${{ github.ref == 'refs/heads/main' }} build_dep: | - gardenlinux/package-golang 1.24.4-1gl0+bp1592 + gardenlinux/package-golang 1.24.9-1gl0+bp1592