containerd: upgrade from 2.0.0-beta to 2.0.5scarthgap

0001-Makefile-update-default-PACKAGE-to-v2.patch is dropped as
it has been merged in new version.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb
index ed73e398..d041b699 100644
--- a/recipes-containers/containerd/containerd-opencontainers_git.bb
+++ b/recipes-containers/containerd/containerd-opencontainers_git.bb
@@ -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}