From 0429ecbcd86d0fb6679a1b453d9db4ba0562269e Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 21 Oct 2021 18:59:33 -0400 Subject: podman: add rdepend on nsenter Podman requires nsenter (for obvious reasons) .. and while this dependency is normally satisfied on images (via busybox), it is possible to build a minimal container image that excludes busybox .. and hence will not have nsenter present. Rather than making this a hard rdepends on util-linux-nsenter, we use a variable: VIRTUAL-RUNTIME_base-utils-nsenter, which can either be set to busybox or util-linux-nsenter (the current default). The VIRTUAL-RUNTIME_base-utils- format follows similarly named OEcore providers and variables .. which the exception that there is no entry in the preferred providers file there, and there's no package created called busybox-nsenter (but perhaps there could be in the future). Signed-off-by: Bruce Ashfield --- recipes-containers/podman/podman_git.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'recipes-containers/podman/podman_git.bb') diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb index 0261ffa9..a77f23b5 100644 --- a/recipes-containers/podman/podman_git.bb +++ b/recipes-containers/podman/podman_git.bb @@ -109,6 +109,10 @@ FILES:${PN} += " \ SYSTEMD_SERVICE:${PN} = "podman.service podman.socket" -RDEPENDS:${PN} += "conmon virtual-runc iptables cni skopeo" +# The other option for this is "busybox", since meta-virt ensures +# that busybox is configured with nsenter +VIRTUAL-RUNTIME_base-utils-nsenter ?= "util-linux-nsenter" + +RDEPENDS:${PN} += "conmon virtual-runc iptables cni skopeo ${VIRTUAL-RUNTIME_base-utils-nsenter}" RRECOMMENDS:${PN} += "slirp4netns kernel-module-xt-masquerade kernel-module-xt-comment" RCONFLICTS:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'docker', 'docker', '', d)}" -- cgit v1.2.3-54-g00ecf