From 718da5ae40540ced4fc48791a84dde9053376d85 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 29 Oct 2024 20:20:18 +0000 Subject: containerd: make network configuration a conflist parsing errors occur if this fragment ends with .conf, so we renamed it to make sure it is processed as a conflist. Tested with containerd + nerdctl Signed-off-by: Bruce Ashfield --- recipes-containers/containerd/containerd_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-containers/containerd/containerd_git.bb b/recipes-containers/containerd/containerd_git.bb index 5f106a67..ffe447c8 100644 --- a/recipes-containers/containerd/containerd_git.bb +++ b/recipes-containers/containerd/containerd_git.bb @@ -9,7 +9,7 @@ SRCREV = "19430264c19b8bd9f940101ec71d52ab2d2e54d5" SRC_URI = "git://github.com/containerd/containerd;branch=main;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.conf \ + file://cni-containerd-net.conflist \ " # Apache-2.0 for containerd @@ -101,5 +101,5 @@ RDEPENDS:${PN} += " ${VIRTUAL-RUNTIME_container_runtime}" ## 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.conf" +CNI_NETWORKING_FILES ?= "${UNPACKDIR}/cni-containerd-net.conflist" inherit cni_networking -- cgit v1.2.3-54-g00ecf