From 04f8621d8213630e3072321c68089ac147e21ebe Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 3 Apr 2021 21:51:31 +0200 Subject: cri-o, podman, packagegroup-container: replace anonymous python function calling bb.parse.SkipRecipe with conditional PNBLACKLISTs * PNBLACKLISTs are IMHO a bit easier to read and easier to override from distro which e.g. provides own recipe for libseccomp Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield --- recipes-core/packagegroups/packagegroup-container.bb | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'recipes-core') diff --git a/recipes-core/packagegroups/packagegroup-container.bb b/recipes-core/packagegroups/packagegroup-container.bb index b3b0d4c3..b06a7c74 100644 --- a/recipes-core/packagegroups/packagegroup-container.bb +++ b/recipes-core/packagegroups/packagegroup-container.bb @@ -44,12 +44,4 @@ RDEPENDS_packagegroup-containerd = " \ virtual/containerd \ " -python __anonymous() { - msg = "" - # ERROR: Nothing PROVIDES 'libseccomp' (but meta-virtualization/recipes-containers/podman/ DEPENDS on or otherwise requires it). - # ERROR: Required build target 'meta-world-pkgdata' has no buildable providers. - # Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'podman', 'libseccomp'] - if 'security' not in d.getVar('BBFILE_COLLECTIONS').split(): - msg += "Make sure meta-security should be present as it provides 'libseccomp'" - raise bb.parse.SkipRecipe(msg) -} +PNBLACKLIST[packagegroup-container] ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'security', '', 'Depends on podman which depends on libseccomp from meta-security which is not included', d)}" -- cgit v1.2.3-54-g00ecf