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

containers: use VIRTUAL-RUNTIME variable to allow container runtime flexibility

Browse Source 
Rather than using virtual-runc (which choses between the old docker and
opencontainer variants), use the newly added
VIRTUAL-RUNTIME_container-runtime variable, which allows switching
betwen runc and crun.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield 2023-03-02 16:14:18 -05:00
parent b3346bfb26
commit fd0958ed9e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes-containers/containerd/containerd-opencontainers_git.bb
View File

@ -98,6 +98,6 @@ INSANE_SKIP:${PN} += "ldflags already-stripped"
COMPATIBLE_HOST = "^(?!(qemu)?mips).*"
RDEPENDS:${BPN} += " virtual-runc"
RDEPENDS:${BPN} += " ${VIRTUAL-RUNTIME_container_runtime}"
CVE_PRODUCT = "containerd"

2
recipes-containers/cri-o/cri-o_git.bb
View File

@ -50,7 +50,7 @@ PACKAGECONFIG[selinux] = ",,libselinux"
PACKAGES =+ "${PN}-config"
RDEPENDS:${PN} += " virtual-containerd virtual-runc"
RDEPENDS:${PN} += " virtual-containerd ${VIRTUAL-RUNTIME_container_runtime}"
RDEPENDS:${PN} += " e2fsprogs-mke2fs conmon util-linux iptables conntrack-tools"
inherit systemd

2
recipes-containers/docker/docker.inc
View File

@ -27,7 +27,7 @@ RDEPENDS:${PN} = "util-linux util-linux-unshare iptables \
bridge-utils \
ca-certificates \
"
RDEPENDS:${PN} += "virtual-containerd virtual-runc"
RDEPENDS:${PN} += "virtual-containerd ${VIRTUAL-RUNTIME_container_runtime}"
RRECOMMENDS:${PN} = "kernel-module-dm-thin-pool kernel-module-nf-nat kernel-module-nf-conntrack-netlink kernel-module-xt-addrtype kernel-module-xt-masquerade"