From 4e35b5d8610e2def34a6059fa4255564111c435a Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 7 Oct 2019 08:10:06 -0400 Subject: podman: fix layer check cut & paste errors The layer check for podman was copied from cri-o .. and some non podman elements came over as part of that copy. We drop selinux as a check, and fix some comments. Signed-off-by: Bruce Ashfield --- recipes-containers/podman/podman_git.bb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb index 64e26723..35e6c2c2 100644 --- a/recipes-containers/podman/podman_git.bb +++ b/recipes-containers/podman/podman_git.bb @@ -16,18 +16,12 @@ DEPENDS = " \ 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: 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', 'cri-o', 'libseccomp'] + # 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) - # 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) } SRCREV = "00057929f5acfd98341964d85722383363376d52" -- cgit v1.2.3-54-g00ecf