From 2b6c6641a9d2d9eec70cb5cb6b956b73634aaf57 Mon Sep 17 00:00:00 2001 From: Kaustubh Dhokte Date: Wed, 2 Mar 2022 02:46:48 -0500 Subject: [PATCH] Debian: runc upversion to 1.0.2 To align with k8s 1.21.8 to 1.23.1 Upgrade runc from version 1.0.0-rc95 to 1.0.2 Dependencies are packaged in this change. Dependencies: golang-github-checkpoint-restore-go-criu-dev (>= 5.1.0~) golang-github-coreos-go-systemd-dev (>= 22.3.2~) golang-github-opencontainers-specs-dev (>= 1.0.2.66~) golang-github-cilium-ebpf-dev (>= 0.6.2~) Note: As of this date, except golang-github-cilium-ebpf-dev, all other dependencies are new and not available in bullseye main. They are available in sid though. It was preferred to package them from source than adding them in base-bullseye.lst. Also, runc failed to build if newest version (0.7.0) of golang-github-cilium-ebpf-dev is used. The exact reason is not clear. So it was preferable to package its minimum required version. Test Plan: runc package builds successfully All packages build successfully Image builds successfully Story: 2009845 Task: 44456 Signed-off-by: Kaustubh Dhokte Change-Id: I4139f9eb689a9e8c8e18c7a9b15fd2d592752ee5 --- debian_pkg_dirs | 4 ++++ .../debian/meta_data.yaml | 7 +++++++ .../debian/meta_data.yaml | 7 +++++++ .../debian/meta_data.yaml | 7 +++++++ .../debian/meta_data.yaml | 7 +++++++ kubernetes/runc/debian/meta_data.yaml | 10 +++++----- 6 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 golang-github-dev/golang-github-checkpoint-restore-go-criu-dev/debian/meta_data.yaml create mode 100644 golang-github-dev/golang-github-cilium-ebpf-dev/debian/meta_data.yaml create mode 100644 golang-github-dev/golang-github-coreos-go-systemd-dev/debian/meta_data.yaml create mode 100644 golang-github-dev/golang-github-opencontainers-specs-dev/debian/meta_data.yaml diff --git a/debian_pkg_dirs b/debian_pkg_dirs index aa4b606cb..2c6c29460 100644 --- a/debian_pkg_dirs +++ b/debian_pkg_dirs @@ -35,6 +35,10 @@ docker/python-docker filesystem/drbd/drbd-tools filesystem/parted golang-github-dev/golang-github-appc-cni +golang-github-dev/golang-github-checkpoint-restore-go-criu-dev +golang-github-dev/golang-github-cilium-ebpf-dev +golang-github-dev/golang-github-coreos-go-systemd-dev +golang-github-dev/golang-github-opencontainers-specs-dev golang-github-dev/golang-github-vishvananda-netlink grub/grub2 grub/grubby diff --git a/golang-github-dev/golang-github-checkpoint-restore-go-criu-dev/debian/meta_data.yaml b/golang-github-dev/golang-github-checkpoint-restore-go-criu-dev/debian/meta_data.yaml new file mode 100644 index 000000000..7c8c09bb5 --- /dev/null +++ b/golang-github-dev/golang-github-checkpoint-restore-go-criu-dev/debian/meta_data.yaml @@ -0,0 +1,7 @@ +--- +debname: golang-github-checkpoint-restore-go-criu +debver: 5.1.0-1 +archive: https://snapshot.debian.org/archive/debian/20211010T204214Z/pool/main/g/golang-github-checkpoint-restore-go-criu/ +revision: + dist: $STX_DIST + PKG_GITREVCOUNT: true diff --git a/golang-github-dev/golang-github-cilium-ebpf-dev/debian/meta_data.yaml b/golang-github-dev/golang-github-cilium-ebpf-dev/debian/meta_data.yaml new file mode 100644 index 000000000..a2fced02d --- /dev/null +++ b/golang-github-dev/golang-github-cilium-ebpf-dev/debian/meta_data.yaml @@ -0,0 +1,7 @@ +--- +debname: golang-github-cilium-ebpf +debver: 0.6.2-2 +archive: https://snapshot.debian.org/archive/debian/20211117T205928Z/pool/main/g/golang-github-cilium-ebpf/ +revision: + dist: $STX_DIST + PKG_GITREVCOUNT: true diff --git a/golang-github-dev/golang-github-coreos-go-systemd-dev/debian/meta_data.yaml b/golang-github-dev/golang-github-coreos-go-systemd-dev/debian/meta_data.yaml new file mode 100644 index 000000000..5b45931e5 --- /dev/null +++ b/golang-github-dev/golang-github-coreos-go-systemd-dev/debian/meta_data.yaml @@ -0,0 +1,7 @@ +--- +debname: golang-github-coreos-go-systemd +debver: 22.3.2-1 +archive: https://snapshot.debian.org/archive/debian/20211010T204214Z/pool/main/g/golang-github-coreos-go-systemd/ +revision: + dist: $STX_DIST + PKG_GITREVCOUNT: true diff --git a/golang-github-dev/golang-github-opencontainers-specs-dev/debian/meta_data.yaml b/golang-github-dev/golang-github-opencontainers-specs-dev/debian/meta_data.yaml new file mode 100644 index 000000000..b0d5a62db --- /dev/null +++ b/golang-github-dev/golang-github-opencontainers-specs-dev/debian/meta_data.yaml @@ -0,0 +1,7 @@ +--- +debname: golang-github-opencontainers-specs +debver: 1.0.2.66.g20a2d97-1 +archive: https://snapshot.debian.org/archive/debian/20211010T204214Z/pool/main/g/golang-github-opencontainers-specs/ +revision: + dist: $STX_DIST + PKG_GITREVCOUNT: true diff --git a/kubernetes/runc/debian/meta_data.yaml b/kubernetes/runc/debian/meta_data.yaml index 665fb9c66..564fcb270 100644 --- a/kubernetes/runc/debian/meta_data.yaml +++ b/kubernetes/runc/debian/meta_data.yaml @@ -1,11 +1,11 @@ --- debname: runc -debver: 1.0.0~rc95.86.g2f8e8e9d+ds1-1 +debver: 1.0.2+ds1-2 dl_path: - name: runc-debian-1.0.0_rc95.86.g2f8e8e9d+ds1-1.tar.gz - url: https://salsa.debian.org/go-team/packages/runc/-/archive/debian/1.0.0_rc95.86.g2f8e8e9d+ds1-1/runc-debian-1.0.0_rc95.86.g2f8e8e9d+ds1-1.tar.gz - md5sum: f7253b7f6e94ade7358ccb04566916a0 - sha256sum: c5acd319744eaf098ad31350fb648e437d0611cc2b6b8f0eca50cfc97f920b6c + name: runc-debian-1.0.2+ds1-2.tar.gz + url: https://salsa.debian.org/go-team/packages/runc/-/archive/debian/1.0.2+ds1-2/runc-debian-1.0.2+ds1-2.tar.gz + md5sum: b5d8a40e5def530abb66f6555c0f55a7 + sha256sum: 7d4d68f2e9f15881fd55de723ee507fbefc396a184ebbeda0cbc560983fd1689 revision: dist: $STX_DIST PKG_GITREVCOUNT: true