Skip to content
This repository has been archived by the owner on May 30, 2023. It is now read-only.

Commit

Permalink
sec-policy/selinux-base: add missing BDEPEND=python[xml]
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@jepio
jepio committed Oct 29, 2021
1 parent 8cbc184 commit 3086ea9
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild
View file
Expand Up @@ -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
Expand Down

4 comments on commit 3086ea9

@thesamesam
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should use python-any-r1 for this (to ensure that the used Python for build matches the dependency). I'll add that to Gentoo shortly. Good spot, thanks!

@thesamesam
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in gentoo/gentoo@e95da4d.

@jepio
Copy link
Contributor Author

@jepio jepio commented on 3086ea9 Nov 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is great, thanks for picking it up! I wasn't sure about the python-any-r1 usage, but your commit makes sense.

@thesamesam
Copy link

@thesamesam thesamesam commented on 3086ea9 Nov 2, 2021 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem! If you get time, the Python guide is worth reading. The eclasses are definitely complex but worth knowing roughly when to use each (or just to check the Python guide if you're not sure, which is what I end up doing often ;)).

Thanks for spotting it!

Please sign in to comment.