containerd: upgrade from 2.0.0-beta to 2.0.5
PATCH 1/1 containerd: upgrade from 2.0.0-beta to 2.0.5
From: Chen Qi <[email protected]>
0001-Makefile-update-default-PACKAGE-to-v2.patch is dropped as it has been merged in new version.
Signed-off-by Chen Qi <[email protected]>
--- ...akefile-update-default-PACKAGE-to-v2.patch | 28 ------------------- .../containerd-opencontainers_git.bb | 12 ++++---- 2 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 recipes-containers/containerd/containerd-opencontainers/0001-Makefile-update-default-PACKAGE-to-v2.patch
recipes-containers/containerd/containerd-opencontainers/0001-Makefile-update-default-PACKAGE-to-v2.patch deleted +0 -28
@@ -1,28 +0,0 @@ -From eb39888898a9d196e3eb63724c6c07777f3b9402 Mon Sep 17 00:00:00 2001 -From: Changqing Li <[email protected]> -Date: Wed, 24 Apr 2024 14:10:11 +0800 -Subject: [PATCH] Makefile: update default PACKAGE to v2 - -Upstream-Status: Submitted [https://github.com/containerd/containerd/pull/10125] - -Signed-off-by: Changqing Li <[email protected]> ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index a5b244191..cb9ff4172 100644 ---- a/Makefile -+++ b/Makefile -@@ -34,7 +34,7 @@ TEST_IMAGE_LIST ?= - # Used to populate variables in version package. - VERSION ?= $(shell git describe --match 'v[0-9]*' --dirty='.m' --always) - REVISION ?= $(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi) --PACKAGE=github.com/containerd/containerd -+PACKAGE=github.com/containerd/containerd/v2 - SHIM_CGO_ENABLED ?= 0 - - ifneq "$(strip $(shell command -v $(GO) 2>/dev/null))" "" --- -2.25.1 -
recipes-containers/containerd/containerd-opencontainers_git.bb +6 -6
@@ -5,19 +5,18 @@ DESCRIPTION = "containerd is a daemon to control runC, built for performance and support as well as checkpoint and restore for cloning and live migration of containers." -SRCREV = "b1624c3628954e769dd50783b63823040b2db38c" -SRC_URI = "git://github.com/containerd/containerd;branch=main;protocol=https;destsuffix=git/src/github.com/containerd/containerd/v2 \ +SRCREV = "fb4c30d4ede3531652d86197bf3fc9515e5276d9" +SRC_URI = "git://github.com/containerd/containerd;branch=release/2.0;protocol=https;destsuffix=git/src/github.com/containerd/containerd/v2 \ file://0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch \ file://0001-build-don-t-use-gcflags-to-define-trimpath.patch \ - file://0001-Makefile-update-default-PACKAGE-to-v2.patch \ " # Apache-2.0 for containerd LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1269f40c0d099c21a871163984590d89" -CONTAINERD_VERSION = "v2.0.0-beta.0" -CVE_VERSION = "v2.0.0-beta.0" +CONTAINERD_VERSION = "v2.0.5" +CVE_VERSION = "2.0.5" # EXTRA_OEMAKE += "GODEBUG=1"
@@ -26,7 +25,7 @@ RPROVIDES:${PN} = "virtual-containerd" S = "${WORKDIR}/git/src/github.com/containerd/containerd/v2" -PV = "${CONTAINERD_VERSION}+git" +PV = "${CONTAINERD_VERSION}" inherit go inherit goarch
@@ -58,6 +57,7 @@ do_compile() { # cannot open file : open : no such file or directory export GO_BUILD_FLAGS="-trimpath -a -pkgdir dontusecurrentpkgs" export GO111MODULE=off + export VERSION="${CONTAINERD_VERSION}" cd ${S}
Signature · 1 line
2.34.1