MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

containerd: make network configuration a conflist

Browse Source 
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 <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield 2024-10-29 20:20:18 +00:00
parent 9f88821d80
commit 718da5ae40
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
recipes-containers/containerd/containerd_git.bb
View File

@ -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