MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-05 05:15:25 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

cri-o, podman, packagegroup-container: replace anonymous python function calling bb.parse.SkipRecipe with conditional PNBLACKLISTs

Browse Source 
* 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 <Martin.Jansa@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Martin Jansa 2021-04-03 21:51:31 +02:00 committed by Bruce Ashfield
parent 4c07340275
commit 04f8621d82
3 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
recipes-containers/cri-o/cri-o_git.bb
View File

@ -43,21 +43,7 @@ RDEPENDS_${PN} = " \
libdevmapper \
"
python __anonymous() {
msg = ""
# ERROR: Nothing PROVIDES 'libseccomp' (but /buildarea/layers/meta-virtualization/recipes-containers/cri-o/cri-o_git.bb 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', 'cri-o', '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)
# ERROR: Nothing PROVIDES 'libselinux' (but /buildarea/layers/meta-virtualization/recipes-containers/cri-o/cri-o_git.bb 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', 'cri-o', 'libselinux']
elif 'selinux' not in d.getVar('BBFILE_COLLECTIONS').split():
msg += "Make sure meta-selinux should be present as it provides 'libselinux'"
raise bb.parse.SkipRecipe(msg)
}
PNBLACKLIST[cri-o] ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'security', bb.utils.contains('BBFILE_COLLECTIONS', 'selinux', '', 'Depends on libselinux from meta-selinux which is not included', d), 'Depends on libseccomp from meta-security which is not included', d)}"
PACKAGES =+ "${PN}-config"

10
recipes-containers/podman/podman_git.bb
View File

@ -14,15 +14,7 @@ DEPENDS = " \
${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
"
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[podman] ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'security', '', 'Depends on libseccomp from meta-security which is not included', d)}"
SRCREV = "288fb688964cb7fc7086d0728daa1f5f6b726dd6"
SRC_URI = " \

10
recipes-core/packagegroups/packagegroup-container.bb
View File

@ -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)}"