From 3fbc1ae7cab384db405c26679ca2fedcb4b6c93d Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 22 Mar 2024 16:28:01 +0000 Subject: podman: conditionally add cni build tag We should ensure that cni is built as part of podman if that's the configured virtual runtime. Although cni is not a primary networking backend for podman, this also allows it to be skipped if netavark is used. Signed-off-by: Bruce Ashfield --- recipes-containers/podman/podman_git.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb index fc532d6a..6ae93369 100644 --- a/recipes-containers/podman/podman_git.bb +++ b/recipes-containers/podman/podman_git.bb @@ -39,9 +39,11 @@ CVE_STATUS[CVE-2023-0778] = "fixed-version: fixed since v4.5.0" PACKAGES =+ "${PN}-contrib" PODMAN_PKG = "github.com/containers/libpod" + +BUILDTAGS_EXTRA ?= "${@bb.utils.contains('VIRTUAL-RUNTIME_container_networking','cni','cni','',d)}" BUILDTAGS ?= "seccomp varlink \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ -exclude_graphdriver_btrfs exclude_graphdriver_devicemapper" +exclude_graphdriver_btrfs exclude_graphdriver_devicemapper ${BUILDTAGS_EXTRA}" # overide LDFLAGS to allow podman to build without: "flag provided but not # defined: -Wl,-O1 export LDFLAGS="" -- cgit v1.2.3-54-g00ecf