From 3e548aca7e720f475a4806f4ff3147c7bc25aa01 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Fri, 29 Oct 2021 07:54:08 +0000 Subject: [PATCH 1/3] Revert "sec-policy/selinux-base: force sequential build in src_configure" This is not the cause for the build failure - a missing build time dependency is. This reverts commit ee3a8514ebd144f081b679225b332ef13b010e26. --- .../selinux-base/selinux-base-2.20200818-r2.ebuild | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild index c660017ef1..6546c608fb 100644 --- a/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild @@ -81,11 +81,7 @@ src_configure() { # Prepare initial configuration cd "${S}/refpolicy" || die - # Parallel make fails with: - # python3 -t -t -E -W error support/sedoctool.py -b policy/booleans.conf -m policy/modules.conf -x doc/policy.xml - # support/sedoctool.py exiting for: Error while parsing xml - # make: *** [Makefile:415: conf.intermediate] Error 1 - emake -j1 conf + emake conf # Setup the policies based on the types delivered by the end user. # These types can be "targeted", "strict", "mcs" and "mls". From 62a52055592cad9245b25ca106ce53bebed32b65 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Fri, 29 Oct 2021 07:55:42 +0000 Subject: [PATCH 2/3] sec-policy/selinux-base: add missing BDEPEND=python[xml] selinux-base requires python to generate xml files, but the dependency is implicit (through policycoreutils). Flatcar made that dependency conditional on USE=python in policycoreutils so that we don't include python in our images, but this causes selinux-base to fail depending on ordering in the bootstrap process. Fix that failure by addin an explicit dependency. --- .../selinux-base/selinux-base-2.20200818-r2.ebuild | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild index 6546c608fb..f862dcd542 100644 --- a/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild @@ -31,7 +31,11 @@ RDEPEND=">=sys-apps/policycoreutils-2.8 >=sys-apps/checkpolicy-2.8 " DEPEND="${RDEPEND}" -BDEPEND="sys-devel/m4" +# flatcar: BDEPEND on python3[xm] - normally pulled in through policycoreutils +# but we made that dep conditional on USE=python +BDEPEND="sys-devel/m4 + >=dev-lang/python-3[xml] +" # flatcar changes From 2497549aa942a9ffa9bdd70295f31e3fe4de119a Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Fri, 29 Oct 2021 12:43:04 +0200 Subject: [PATCH 3/3] Update sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild Co-authored-by: Mathieu Tortuyaux --- .../sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild index f862dcd542..17d06e1149 100644 --- a/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild @@ -31,7 +31,7 @@ RDEPEND=">=sys-apps/policycoreutils-2.8 >=sys-apps/checkpolicy-2.8 " DEPEND="${RDEPEND}" -# flatcar: BDEPEND on python3[xm] - normally pulled in through policycoreutils +# flatcar: BDEPEND on python3[xml] - normally pulled in through policycoreutils # but we made that dep conditional on USE=python BDEPEND="sys-devel/m4 >=dev-lang/python-3[xml]