---
recipes-containers/podman/podman_git.bb | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/recipes-containers/podman/podman_git.bb
b/recipes-containers/podman/podman_git.bb
index dea14ba..9e6e748 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -68,6 +68,9 @@ PACKAGECONFIG ?= "docker"
# Supported are: virtual-runc, crun
DEFAULT_CONTAINER_RUNTIME ??= "virtual-runc"
+# Supported are: cni, netavark
+DEFAULT_NETWORK_STACK ??= "cni"
+
do_compile() {
cd ${S}/src
rm -rf .gopath
@@ -129,7 +132,7 @@ FILES:${PN} += " \
${systemd_unitdir}/system/* \
${systemd_unitdir}/user/* \
${nonarch_libdir}/tmpfiles.d/* \
- ${sysconfdir}/cni \
+ ${@bb.utils.contains('DEFAULT_NETWORK_STACK', 'cni', '${sysconfdir}/cni',
'', d)} \
"
SYSTEMD_SERVICE:${PN} = "podman.service podman.socket"
@@ -139,7 +142,7 @@ SYSTEMD_SERVICE:${PN} = "podman.service podman.socket"
VIRTUAL-RUNTIME_base-utils-nsenter ?= "util-linux-nsenter"
RDEPENDS:${PN} += "\
- conmon ${DEFAULT_CONTAINER_RUNTIME} iptables cni skopeo
${VIRTUAL-RUNTIME_base-utils-nsenter} \
+ conmon ${DEFAULT_CONTAINER_RUNTIME} iptables ${DEFAULT_NETWORK_STACK}
skopeo ${VIRTUAL-RUNTIME_base-utils-nsenter} \
${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'fuse-overlayfs
slirp4netns', '', d)} \
"
RRECOMMENDS:${PN} += "slirp4netns kernel-module-xt-masquerade
kernel-module-xt-comment"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#7656):
https://lists.yoctoproject.org/g/meta-virtualization/message/7656
Mute This Topic: https://lists.yoctoproject.org/mt/94381607/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
