5 files changed, 38 insertions, 36 deletions

diff --git a/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-update-default-PACKAGE-to-v2.patch b/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-update-default-PACKAGE-to-v2.patch
deleted file mode 100644
index 74e313b5..00000000
--- a/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-update-default-PACKAGE-to-v2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From eb39888898a9d196e3eb63724c6c07777f3b9402 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-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 <changqing.li@windriver.com>
----
- 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
-
diff --git a/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch b/recipes-containers/containerd/containerd/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch
index 63498a86..63498a86 100644
--- a/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch
+++ b/recipes-containers/containerd/containerd/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch
diff --git a/recipes-containers/containerd/containerd-opencontainers/0001-build-don-t-use-gcflags-to-define-trimpath.patch b/recipes-containers/containerd/containerd/0001-build-don-t-use-gcflags-to-define-trimpath.patch
index 62580c6c..62580c6c 100644
--- a/recipes-containers/containerd/containerd-opencontainers/0001-build-don-t-use-gcflags-to-define-trimpath.patch
+++ b/recipes-containers/containerd/containerd/0001-build-don-t-use-gcflags-to-define-trimpath.patch
diff --git a/recipes-containers/containerd/containerd/cni-containerd-net.conflist b/recipes-containers/containerd/containerd/cni-containerd-net.conflist
new file mode 100644
index 00000000..ca434d6f
--- /dev/null
+++ b/recipes-containers/containerd/containerd/cni-containerd-net.conflist
@@ -0,0 +1,24 @@
+{
+  "cniVersion": "0.4.0",
+  "name": "containerd-net",
+  "plugins": [
+    {
+      "type": "bridge",
+      "bridge": "cni0",
+      "isGateway": true,
+      "ipMasq": true,
+      "promiscMode": true,
+      "ipam": {
+        "type": "host-local",
+        "subnet": "10.88.0.0/16",
+        "routes": [
+          { "dst": "0.0.0.0/0" }
+        ]
+      }
+    },
+    {
+      "type": "portmap",
+      "capabilities": {"portMappings": true}
+    }
+  ]
+}
diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd_git.bb
index ed73e398..c683fbeb 100644
--- a/recipes-containers/containerd/containerd-opencontainers_git.bb
+++ b/recipes-containers/containerd/containerd_git.bb
@@ -5,24 +5,27 @@ 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 = "06b99ca80cdbfbc6cc8bd567021738c9af2b36ce"
+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 \
+           file://cni-containerd-net.conflist \
           "
 
 # 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.2"
+CVE_VERSION = "v2.0.2"
 
 # EXTRA_OEMAKE += "GODEBUG=1"
 
-PROVIDES += "virtual/containerd"
-RPROVIDES:${PN} = "virtual-containerd"
+# containerd-opencontainers is to provide compatibility with external
+# packagegroups / recipes that depend on the existing split of containerd
+# between docker and opencontainers. We can drop it in the future.
+PROVIDES += "virtual/containerd containerd-opencontainers"
+RPROVIDES:${PN} = "virtual-containerd containerd-opencontainers"
 
 S = "${WORKDIR}/git/src/github.com/containerd/containerd/v2"
 
@@ -96,4 +99,7 @@ COMPATIBLE_HOST = "^(?!(qemu)?mips).*"
 
 RDEPENDS:${PN} += " ${VIRTUAL-RUNTIME_container_runtime}"
 
-CVE_PRODUCT = "containerd"
+## This may need to be made conditional on K3S or similar being
+## configured in the distro, since we may have collisions.
+CNI_NETWORKING_FILES ?= "${UNPACKDIR}/cni-containerd-net.conflist"
+inherit cni_networking