Add sysvinit to DISTRO_FEATURES in oe-selinux distro.
The oe-selinux distro won't build against the master branch of oe-core unless sysvinit is in DISTRO_FEATURES.
Commit c72ec4b52827f75351790eab483d258b2e87611a in oe-core adds a sanity check to the packagegroup class that requires the VIRTUAL-RUNTIME_init_manager explicitly be set in DISTRO_FEATURES.
--- conf/distro/oe-selinux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
conf/distro/oe-selinux.conf +1 -1
@@ -1,4 +1,4 @@ DISTRO = "oe-selinux" DISTROOVERRIDES .= ":selinux" -DISTRO_FEATURES_append = "pam selinux" +DISTRO_FEATURES_append = "pam selinux sysvinit"
Signature · 1 line
1.7.10.4
conf/distro/oe-selinux.conf line 4
Quoted 2 lines · Philip Tricca
conf/distro/oe-selinux.conf +1
-1-DISTRO_FEATURES_append = "pam selinux" +DISTRO_FEATURES_append = "pam selinux sysvinit"
sysvinit is a backfilled distro feature so you shouldn't need this. I can see two cases where you may need it: either you're setting DISTRO_FEATURES_BACKFILL_CONSIDERED to sysvinit (in which case don't), or you're cherry-picking pieces from different releases (in which case this probably isn't the fix you're after).
Ross
Quoted 7 lines · Ross
conf/distro/oe-selinux.conf line 4
Quoted 2 lines · Philip Tricca
conf/distro/oe-selinux.conf +1
-1-DISTRO_FEATURES_append = "pam selinux" +DISTRO_FEATURES_append = "pam selinux sysvinit"sysvinit is a backfilled distro feature so you shouldn't need this. I can see two cases where you may need it: either you're setting
DISTRO_FEATURES_BACKFILL_CONSIDEREDto sysvinit (in which case don't),
I'm not even sure what DISTRO_FEATURES_BACKFILL_CONSIDERED is so we can rule that out. Finding it in the docs now ...
Quoted 2 lines
or you're cherry-picking pieces from different releases (in which case this probably isn't the fix you're after).
I'm not doing anything so sophisticated (misguided?). I ran into this while setting up a build to test unrelated patches. Regardless this is the type of feedback I need so thank you. I'll go back and pull fresh from upstream and re-test.
Regards,
- Philip
Quoted 12 lines · Philip Tricca
Quoted 7 lines · Ross
conf/distro/oe-selinux.conf line 4
Quoted 2 lines · Philip Tricca
conf/distro/oe-selinux.conf +1
-1-DISTRO_FEATURES_append = "pam selinux" +DISTRO_FEATURES_append = "pam selinux sysvinit"sysvinit is a backfilled distro feature so you shouldn't need this. I can see two cases where you may need it: either you're setting
DISTRO_FEATURES_BACKFILL_CONSIDEREDto sysvinit (in which case don't),I'm not even sure what
DISTRO_FEATURES_BACKFILL_CONSIDEREDis so we can rule that out. Finding it in the docs now ...
Quoted 7 lines
Quoted 2 lines
or you're cherry-picking pieces from different releases (in which case this probably isn't the fix you're after).
I'm not doing anything so sophisticated (misguided?). I ran into this while setting up a build to test unrelated patches. Regardless this is the type of feedback I need so thank you. I'll go back and pull fresh from upstream and re-test.
I've located the source of this issue. Turns out DISTRO_FEATURES_BACKFILL and DISTRO_FEATURES are concatenated somewhere along the way. The lack of leading whitespace in the DISTRO_FEATURES_append from the oe-selinux distro was causing 'sysvinit' and 'pam' to be combined into 'sysvinitpam'. The check in the packagegroup class that I was running into must be evaluated before any sanity check for invalid entries DISTRO_FEATURES.
Adding a leading space to the DISTRO_FEATURES_append in the oe-selinux distro resolves this issue. Thanks for the pointer to the backfill mechanism Ross. I'll submit a new patch.
Cheers,
- Philip