podman: fix CNI build tag for non-netavark networking configurations

BUILDTAGS_EXTRA was gated on VIRTUAL-RUNTIME_container_networking == "cni",
which excluded the cni build tag in vruntime builds where that variable is
intentionally blank (vpdmn-rootfs-image installs cni packages directly).
This caused podman to be compiled with netavark-only support, failing at
runtime with "cni support is not enabled in this build" when containers.conf
sets network_backend = "cni".

Include the cni build tag unless the distro explicitly selects netavark.
This respects the podman profile's upstream preference for netavark-only
while ensuring all other configurations (containerd, default, docker, k3s,
vruntime) retain CNI support.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

1 files changed, 7 insertions, 1 deletions

diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
index 45ddec1a..886d6e90 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -36,7 +36,13 @@ PACKAGES =+ "${PN}-contrib"
 
 PODMAN_PKG = "github.com/containers/podman"
 
-BUILDTAGS_EXTRA ?= "${@bb.utils.contains('VIRTUAL-RUNTIME_container_networking','cni','cni','',d)}"
+# Include the cni build tag unless the distro explicitly selects netavark-only.
+# The runtime backend is selected via containers.conf (network_backend),
+# but podman must be compiled with the cni tag to support it at all.
+# Previously this was gated on VIRTUAL-RUNTIME_container_networking == "cni",
+# which excluded cni in vruntime builds where that variable is intentionally
+# blank (vpdmn-rootfs-image installs cni packages directly in IMAGE_INSTALL).
+BUILDTAGS_EXTRA ?= "${@'' if d.getVar('VIRTUAL-RUNTIME_container_networking') == 'netavark' else 'cni'}"
 BUILDTAGS ?= "seccomp varlink \
 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
 exclude_graphdriver_btrfs exclude_graphdriver_devicemapper ${BUILDTAGS_EXTRA}"