containerd: update to v2.0.0

Bumping containerd to version v2.0.0-25-g961cac9aa, which comprises the following commits:

    34a45cab2 Publish attestation as release artifact
    7dec6b460 move rocky 9.4 to almalinux/9 in CI
    cf07f28ee *: should align pipe's owner with init process
    986088866 fix: set the credentials even if not provided
    9081e979f update runc binary to 1.2.2
    6399c936f Revert "Disable vagrant strict dependency checking"
    a7f2b562f fsverity_linux.go: Fix fsverity.IsEnabled() for big endian systems
    389e781ea build(deps): bump github.com/containerd/typeurl/v2 from 2.2.2 to 2.2.3
    30b929ece fsverity_test.go: fix major/minor device number resolving
    10996a334 fsverity_test.go: fix nil pointer dereference, fix test fail
    5b879f30c update to go1.23.3 / go1.22.9
    e99c2b55c Avoid arch info in the sed/replace when building cri-cni-containerd.tar.gz
    458215f6c ci: enable marking 2.0 releases as latest
    03ba4ce1f Update release notes for v2.0.0
    f2da3fd68 Update release docs for v2.0.0
    ff09b428e Update typeurl to v2.2.2
    a43e7c1e2 build(deps): bump softprops/action-gh-release from 2.0.8 to 2.0.9
    edf367cab build(deps): bump github.com/containerd/nri from 0.7.0 to 0.8.0
    21f636751 build(deps): bump github.com/containerd/typeurl/v2 from 2.2.0 to 2.2.1
    1edc2147f build(deps): bump google-github-actions/auth from 2.1.6 to 2.1.7
    2d8fec45a go.mod: k8s.io/* v0.31.2
    bef201fe6 build(deps): bump google-github-actions/upload-cloud-storage
    bd10a6096 Update platforms to v1.0.0-rc.0
    ae73e3013 Disable vagrant strict dependency checking
    33677d56d Update containerd API to v1.8.0 release
    d38911808 Prepare release notes for api/v1.8.0
    93f9db2ad Update errdefs tag to v1.0.0
    bddeba825 Make TestContainerPids more resilient
    edb980ac0 update runc binary to 1.2.1
    bf47b6ebc docs/containerd-2.0.md: add more highlights
    f5ce859ee docs/containerd-2.0.md: fix the deprecation release of AUFS
    bedd85a36 RELEASES.md: k8s: fix CRI v1alpha2 removal release, remove old releases
    4594f5cac services/snapshots: include name of snapshotter in debug logs
    77d783e2c Update hcsshim to v0.12.9
    79089232b build(deps): bump actions/checkout from 4.2.1 to 4.2.2
    2789ba30e build(deps): bump actions/cache from 4.1.1 to 4.1.2
    6b655d093 build(deps): bump github/codeql-action from 3.26.13 to 3.27.0
    9ed6e05b2 config: v1Migrate: support DisabledPlugins and RequiredPlugins
    4b2bca00b config: migrate version before merging
    700b90618 resolver/docker: fix confusing "trying next host" log
    3cc2343de local: avoid writing to content root on readonly store

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

1 files changed, 4 insertions, 4 deletions

diff --git a/recipes-containers/containerd/containerd_git.bb b/recipes-containers/containerd/containerd_git.bb
index 99cc8b2f..45ba1358 100644
--- a/recipes-containers/containerd/containerd_git.bb
+++ b/recipes-containers/containerd/containerd_git.bb
@@ -5,8 +5,8 @@ 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 = "1e6fdb531bbd947d2cd247c8d32969619bc2ec37"
-SRC_URI = "git://github.com/containerd/containerd;branch=main;protocol=https;destsuffix=git/src/github.com/containerd/containerd/v2 \
+SRCREV = "961cac9aa08e444fc0ddf04ecb4cfda9da6b4cc0"
+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://cni-containerd-net.conflist \
@@ -16,8 +16,8 @@ SRC_URI = "git://github.com/containerd/containerd;branch=main;protocol=https;des
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1269f40c0d099c21a871163984590d89"
 
-CONTAINERD_VERSION = "v2.0.0-rc.6"
-CVE_VERSION = "v2.0.0-beta.0"
+CONTAINERD_VERSION = "v2.0.0"
+CVE_VERSION = "v2.0.0"
 
 # EXTRA_OEMAKE += "GODEBUG=1"