From fd0958ed9e38fb5215218ac772230abc2f65c4c2 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 2 Mar 2023 16:14:18 -0500 Subject: containers: use VIRTUAL-RUNTIME variable to allow container runtime flexibility 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 --- recipes-containers/containerd/containerd-opencontainers_git.bb | 2 +- recipes-containers/cri-o/cri-o_git.bb | 2 +- recipes-containers/docker/docker.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb index 83177094..2071fdc6 100644 --- a/recipes-containers/containerd/containerd-opencontainers_git.bb +++ b/recipes-containers/containerd/containerd-opencontainers_git.bb @@ -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" diff --git a/recipes-containers/cri-o/cri-o_git.bb b/recipes-containers/cri-o/cri-o_git.bb index 2ae3303c..0121b2f7 100644 --- a/recipes-containers/cri-o/cri-o_git.bb +++ b/recipes-containers/cri-o/cri-o_git.bb @@ -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 diff --git a/recipes-containers/docker/docker.inc b/recipes-containers/docker/docker.inc index 2487456e..4a4bc4f6 100644 --- a/recipes-containers/docker/docker.inc +++ b/recipes-containers/docker/docker.inc @@ -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" -- cgit v1.2.3-54-g00ecf