Skip to contentSkip to conversation

podman: drop selinux sanity check

PATCH In review [email protected] 2 participants 3 messages Oct 7, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 podman: drop selinux sanity check

From: Ming Liu <[email protected]>

libselinux is not a dependency of podman, drop a useless sanity check.

Also fix some invalid comments.

---
 recipes-containers/podman/podman_git.bb | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
recipes-containers/podman/podman_git.bb +2 -8
index 64e2672..835e4d5 100644
@@ -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 /buildarea/layers/meta-virtualization/recipes-containers/podman/podman_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']
+    # 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"
Signature · 1 line
2.7.4
#1 lore raw

I also have a fix for this, that I hadn't pushed yet.

Will push my change later today.

Cheers,

Bruce

Quoted 45 lines · On Mon, Oct 7, 2019 at 6:46 AM <[email protected]> wrote:

From: Ming Liu <[email protected]>

libselinux is not a dependency of podman, drop a useless sanity check.

Also fix some invalid comments.

---
 recipes-containers/podman/podman_git.bb | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
recipes-containers/podman/podman_git.bb +2 -9
index 64e2672..835e4d5 100644
@@ -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 /buildarea/layers/meta-virtualization/recipes-containers/podman/podman_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']
+    # 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"
--

2.7.4

--
_______________________________________________
meta-virtualization mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-virtualization

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
author
#2 lore raw

Great! Good to know that, we are currently blocked by this sanity check.

//Ming Liu

Bruce Ashfield <[email protected]> 於 2019年10月7日 週一 下午2:05寫道:

Quoted 76 lines

I also have a fix for this, that I hadn't pushed yet.

Will push my change later today.

Cheers,

Bruce

Quoted 5 lines · On Mon, Oct 7, 2019 at 6:46 AM <[email protected]> wrote:

From: Ming Liu <[email protected]>

libselinux is not a dependency of podman, drop a useless sanity check.

Review

Quoted 8 lines

Also fix some invalid comments.

---
 recipes-containers/podman/podman_git.bb | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
(quoted diff) +0 -0

b/recipes-containers/podman/podman_git.bb

recipes-containers/podman/podman_git.bb DEPENDS = " \ · line 19

Quoted 8 lines

index 64e2672..835e4d5 100644

recipes-containers/podman/podman_git.bb +0 -1
@@ -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).

recipes-containers/podman/podman_git.bb DEPENDS = " \ · line 19

Quoted 1 line
recipes-containers/podman/podman_git.bb +1 -0
+    # ERROR: Nothing PROVIDES 'libseccomp' (but

/buildarea/layers/meta-virtualization/recipes-containers/podman/ podman_git.bb DEPENDS on or otherwise requires it).

recipes-containers/podman/podman_git.bb DEPENDS = " \ · line 20

Quoted 1 line
recipes-containers/podman/podman_git.bb +0 -0
     # ERROR: Required build target 'meta-world-pkgdata' has no

buildable providers.

recipes-containers/podman/podman_git.bb DEPENDS = " \ · line 21

Quoted 1 line
recipes-containers/podman/podman_git.bb +0 -1
-    # Missing or unbuildable dependency chain was:

['meta-world-pkgdata', 'cri-o', 'libseccomp']

recipes-containers/podman/podman_git.bb DEPENDS = " \ · line 21

Quoted 1 line
recipes-containers/podman/podman_git.bb +1 -0
+    # Missing or unbuildable dependency chain was:

['meta-world-pkgdata', 'podman', 'libseccomp']

recipes-containers/podman/podman_git.bb DEPENDS = " \ · line 23

Quoted 2 lines
recipes-containers/podman/podman_git.bb +0 -0
     if 'security' not in d.getVar('BBFILE_COLLECTIONS').split():
         msg += "Make sure meta-security should be present as it

provides 'libseccomp'"

recipes-containers/podman/podman_git.bb DEPENDS = " \ · line 25

Quoted 2 lines
recipes-containers/podman/podman_git.bb +0 -1
         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).

recipes-containers/podman/podman_git.bb DEPENDS = " \ · line 26

Quoted 1 line
recipes-containers/podman/podman_git.bb +0 -1
-    # ERROR: Required build target 'meta-world-pkgdata' has no

buildable providers.

recipes-containers/podman/podman_git.bb DEPENDS = " \ · line 27

Quoted 1 line
recipes-containers/podman/podman_git.bb +0 -1
-    # Missing or unbuildable dependency chain was:

['meta-world-pkgdata', 'cri-o', 'libselinux']

recipes-containers/podman/podman_git.bb DEPENDS = " \ · line 29

Quoted 2 lines
recipes-containers/podman/podman_git.bb +0 -2
-    elif 'selinux' not in d.getVar('BBFILE_COLLECTIONS').split():
-        msg += "Make sure meta-selinux should be present as it provides

'libselinux'"

Quoted 7 lines
recipes-containers/podman/podman_git.bb +0 -2
-        raise bb.parse.SkipRecipe(msg)
 }
 
 SRCREV = "00057929f5acfd98341964d85722383363376d52"
--

2.7.4

Quoted 5 lines

--
_______________________________________________
meta-virtualization mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-virtualization

--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II