From b70b45de8c794ad3c7806ff17615d3e2dd2f4fae Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 20 Nov 2024 09:50:33 +0100 Subject: packagegroup-container: respect seccomp in DISTRO_FEATURES * fix f53b101d455d7e7447fa83f2faecb5e05d595b3e * you might want to skip whole packagegroup-netavark without seccomp, but without this parsing world in DISTRO without seccomp fails with: ERROR: Nothing RPROVIDES 'netavark' (but meta-virtualization/recipes-core/packagegroups/packagegroup-container.bb RDEPENDS on or otherwise requires it) netavark was skipped: missing required distro feature 'seccomp' (not in DISTRO_FEATURES) NOTE: Runtime target 'netavark' is unbuildable, removing... Missing or unbuildable dependency chain was: ['netavark'] ERROR: Nothing RPROVIDES 'packagegroup-docker' (but meta-virtualization/recipes-core/packagegroups/packagegroup-container.bb RDEPENDS on or otherwise requires it) No eligible RPROVIDERs exist for 'packagegroup-docker' NOTE: Runtime target 'packagegroup-docker' is unbuildable, removing... Missing or unbuildable dependency chain was: ['packagegroup-docker'] ERROR: Nothing RPROVIDES 'packagegroup-oci' (but meta-virtualization/recipes-core/packagegroups/packagegroup-container.bb RDEPENDS on or otherwise requires it) No eligible RPROVIDERs exist for 'packagegroup-oci' NOTE: Runtime target 'packagegroup-oci' is unbuildable, removing... Missing or unbuildable dependency chain was: ['packagegroup-oci'] ERROR: Nothing RPROVIDES 'packagegroup-container' (but meta-virtualization/recipes-core/packagegroups/packagegroup-container.bb RDEPENDS on or otherwise requires it) No eligible RPROVIDERs exist for 'packagegroup-container' NOTE: Runtime target 'packagegroup-container' is unbuildable, removing... Missing or unbuildable dependency chain was: ['packagegroup-container'] ERROR: Nothing RPROVIDES 'packagegroup-lxc' (but meta-virtualization/recipes-core/packagegroups/packagegroup-container.bb RDEPENDS on or otherwise requires it) No eligible RPROVIDERs exist for 'packagegroup-lxc' NOTE: Runtime target 'packagegroup-lxc' is unbuildable, removing... Missing or unbuildable dependency chain was: ['packagegroup-lxc'] ERROR: Nothing RPROVIDES 'packagegroup-cni' (but meta-virtualization/recipes-core/packagegroups/packagegroup-container.bb RDEPENDS on or otherwise requires it) No eligible RPROVIDERs exist for 'packagegroup-cni' NOTE: Runtime target 'packagegroup-cni' is unbuildable, removing... Missing or unbuildable dependency chain was: ['packagegroup-cni'] ERROR: Nothing RPROVIDES 'aardvark-dns' (but meta-virtualization/recipes-core/packagegroups/packagegroup-container.bb RDEPENDS on or otherwise requires it) aardvark-dns was skipped: missing required distro feature 'seccomp' (not in DISTRO_FEATURES) NOTE: Runtime target 'aardvark-dns' is unbuildable, removing... Missing or unbuildable dependency chain was: ['aardvark-dns'] ERROR: Nothing RPROVIDES 'conmon' (but meta-virtualization/recipes-core/packagegroups/packagegroup-container.bb RDEPENDS on or otherwise requires it) conmon was skipped: missing required distro feature 'seccomp' (not in DISTRO_FEATURES) NOTE: Runtime target 'conmon' is unbuildable, removing... Missing or unbuildable dependency chain was: ['conmon'] Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield --- recipes-core/packagegroups/packagegroup-container.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipes-core/packagegroups/packagegroup-container.bb b/recipes-core/packagegroups/packagegroup-container.bb index aba1d3e1..21402d65 100644 --- a/recipes-core/packagegroups/packagegroup-container.bb +++ b/recipes-core/packagegroups/packagegroup-container.bb @@ -48,13 +48,12 @@ RDEPENDS:packagegroup-cni = " \ " RDEPENDS:packagegroup-netavark = " \ - netavark \ - aardvark-dns \ + ${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'netavark aardvark-dns', '', d)} \ " RDEPENDS:packagegroup-container-tools = " \ skopeo \ - conmon \ + ${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'conmon', '', d)} \ umoci \ ${@bb.utils.contains('VIRTUAL-RUNTIME_container_engine','podman','podman-tui nerdctl podman-compose','',d)} \ ${@bb.utils.contains_any('VIRTUAL-RUNTIME_container_engine','dcoker docker-moby','docker-compose','',d)} \ -- cgit v1.2.3-54-g00ecf