diff options
| author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-10-07 08:10:06 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-10-07 08:10:06 -0400 |
| commit | 4e35b5d8610e2def34a6059fa4255564111c435a (patch) | |
| tree | e113173e3ded70e3613f523d24652067fdee5a42 | |
| parent | 9e7345d8ecd7b55f3af614dbd31d52973c919b93 (diff) | |
| download | meta-virtualization-4e35b5d8610e2def34a6059fa4255564111c435a.tar.gz | |
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 <bruce.ashfield@gmail.com>
| -rw-r--r-- | recipes-containers/podman/podman_git.bb | 10 |
1 files 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 = " \ | |||
| 16 | 16 | ||
| 17 | python __anonymous() { | 17 | python __anonymous() { |
| 18 | msg = "" | 18 | msg = "" |
| 19 | # ERROR: Nothing PROVIDES 'libseccomp' (but /buildarea/layers/meta-virtualization/recipes-containers/cri-o/cri-o_git.bb DEPENDS on or otherwise requires it). | 19 | # ERROR: Nothing PROVIDES 'libseccomp' (but meta-virtualization/recipes-containers/podman/ DEPENDS on or otherwise requires it). |
| 20 | # ERROR: Required build target 'meta-world-pkgdata' has no buildable providers. | 20 | # ERROR: Required build target 'meta-world-pkgdata' has no buildable providers. |
| 21 | # Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'cri-o', 'libseccomp'] | 21 | # Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'podman', 'libseccomp'] |
| 22 | if 'security' not in d.getVar('BBFILE_COLLECTIONS').split(): | 22 | if 'security' not in d.getVar('BBFILE_COLLECTIONS').split(): |
| 23 | msg += "Make sure meta-security should be present as it provides 'libseccomp'" | 23 | msg += "Make sure meta-security should be present as it provides 'libseccomp'" |
| 24 | raise bb.parse.SkipRecipe(msg) | 24 | raise bb.parse.SkipRecipe(msg) |
| 25 | # ERROR: Nothing PROVIDES 'libselinux' (but /buildarea/layers/meta-virtualization/recipes-containers/cri-o/cri-o_git.bb DEPENDS on or otherwise requires it). | ||
| 26 | # ERROR: Required build target 'meta-world-pkgdata' has no buildable providers. | ||
| 27 | # Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'cri-o', 'libselinux'] | ||
| 28 | elif 'selinux' not in d.getVar('BBFILE_COLLECTIONS').split(): | ||
| 29 | msg += "Make sure meta-selinux should be present as it provides 'libselinux'" | ||
| 30 | raise bb.parse.SkipRecipe(msg) | ||
| 31 | } | 25 | } |
| 32 | 26 | ||
| 33 | SRCREV = "00057929f5acfd98341964d85722383363376d52" | 27 | SRCREV = "00057929f5acfd98341964d85722383363376d52" |
