From c64bc6070df488040d90b795add3b7b8838a7662 Mon Sep 17 00:00:00 2001 From: hongxu Date: Fri, 13 Dec 2019 00:34:51 -0800 Subject: sysvinit: sync bbappend to 2.96 Since oe-core upgrades sysvinit to 2.96, wildcard its bbappend and drop the backported patch Signed-off-by: Hongxu Jia Signed-off-by: Joe MacDonald --- .../files/sysvinit-fix-is_selinux_enabled.patch | 71 ---------------------- recipes-core/sysvinit/sysvinit-2.88dsf_selinux.inc | 11 ---- recipes-core/sysvinit/sysvinit_2.88dsf.bbappend | 1 - recipes-core/sysvinit/sysvinit_2.9%.bbappend | 1 + recipes-core/sysvinit/sysvinit_selinux.inc | 9 +++ 5 files changed, 10 insertions(+), 83 deletions(-) delete mode 100644 recipes-core/sysvinit/files/sysvinit-fix-is_selinux_enabled.patch delete mode 100644 recipes-core/sysvinit/sysvinit-2.88dsf_selinux.inc delete mode 100644 recipes-core/sysvinit/sysvinit_2.88dsf.bbappend create mode 100644 recipes-core/sysvinit/sysvinit_2.9%.bbappend create mode 100644 recipes-core/sysvinit/sysvinit_selinux.inc diff --git a/recipes-core/sysvinit/files/sysvinit-fix-is_selinux_enabled.patch b/recipes-core/sysvinit/files/sysvinit-fix-is_selinux_enabled.patch deleted file mode 100644 index 62703b1..0000000 --- a/recipes-core/sysvinit/files/sysvinit-fix-is_selinux_enabled.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 0db0276202094c8d902fc93a18eca453b6211f8a Mon Sep 17 00:00:00 2001 -From: Xin Ouyang -Date: Thu, 12 Apr 2012 10:48:04 +0800 -Subject: [PATCH] sysvinit: Fix is_selinux_enabled() for libselinux - -is_selinux_enabled()!=1 means SELinux is disabled by kernel -or SELinux is enabled but policy is not loaded. -Only at this time, /sbin/init program should call -selinux_init_load_policy() to detect whether SELinux is enabled -and to load SELinux policy. - -This is fixed already in the upstream sysvinit, -http://svn.savannah.nongnu.org/viewvc/sysvinit/trunk/src/init.c?root=sysvinit&r1=72&r2=90 ---- - src/init.c | 33 +++++++++++++-------------------- - 1 files changed, 13 insertions(+), 20 deletions(-) - -diff --git a/src/init.c b/src/init.c -index 27532ad..75ccf25 100644 ---- a/src/init.c -+++ b/src/init.c -@@ -54,10 +54,6 @@ - - #ifdef WITH_SELINUX - # include --# include --# ifndef MNT_DETACH /* present in glibc 2.10, missing in 2.7 */ --# define MNT_DETACH 2 --# endif - #endif - - #ifdef __i386__ -@@ -2869,22 +2865,19 @@ int main(int argc, char **argv) - - #ifdef WITH_SELINUX - if (getenv("SELINUX_INIT") == NULL) { -- const int rc = mount("proc", "/proc", "proc", 0, 0); -- if (is_selinux_enabled() > 0) { -- putenv("SELINUX_INIT=YES"); -- if (rc == 0) umount2("/proc", MNT_DETACH); -- if (selinux_init_load_policy(&enforce) == 0) { -- execv(myname, argv); -- } else { -- if (enforce > 0) { -- /* SELinux in enforcing mode but load_policy failed */ -- /* At this point, we probably can't open /dev/console, so log() won't work */ -- fprintf(stderr,"Unable to load SELinux Policy. Machine is in enforcing mode. Halting now.\n"); -- exit(1); -- } -- } -- } -- if (rc == 0) umount2("/proc", MNT_DETACH); -+ if (is_selinux_enabled() != 1) { -+ if (selinux_init_load_policy(&enforce) == 0) { -+ putenv("SELINUX_INIT=YES"); -+ execv(myname, argv); -+ } else { -+ if (enforce > 0) { -+ /* SELinux in enforcing mode but load_policy failed */ -+ /* At this point, we probably can't open /dev/console, so log() won't work */ -+ fprintf(stderr,"Unable to load SELinux Policy. Machine is in enforcing mode. Halting now.\n"); -+ exit(1); -+ } -+ } -+ } - } - #endif - /* Start booting. */ --- -1.7.5.4 - diff --git a/recipes-core/sysvinit/sysvinit-2.88dsf_selinux.inc b/recipes-core/sysvinit/sysvinit-2.88dsf_selinux.inc deleted file mode 100644 index fcfbdb7..0000000 --- a/recipes-core/sysvinit/sysvinit-2.88dsf_selinux.inc +++ /dev/null @@ -1,11 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -B = "${S}" - -SRC_URI += "file://sysvinit-fix-is_selinux_enabled.patch" - -inherit selinux - -DEPENDS += "${LIBSELINUX}" - -EXTRA_OEMAKE += "${@target_selinux(d, 'WITH_SELINUX=\"yes\"')}" diff --git a/recipes-core/sysvinit/sysvinit_2.88dsf.bbappend b/recipes-core/sysvinit/sysvinit_2.88dsf.bbappend deleted file mode 100644 index 9df30b6..0000000 --- a/recipes-core/sysvinit/sysvinit_2.88dsf.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'sysvinit-2.88dsf_selinux.inc', '', d)} diff --git a/recipes-core/sysvinit/sysvinit_2.9%.bbappend b/recipes-core/sysvinit/sysvinit_2.9%.bbappend new file mode 100644 index 0000000..4ec2267 --- /dev/null +++ b/recipes-core/sysvinit/sysvinit_2.9%.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'sysvinit_selinux.inc', '', d)} diff --git a/recipes-core/sysvinit/sysvinit_selinux.inc b/recipes-core/sysvinit/sysvinit_selinux.inc new file mode 100644 index 0000000..2e54330 --- /dev/null +++ b/recipes-core/sysvinit/sysvinit_selinux.inc @@ -0,0 +1,9 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +B = "${S}" + +inherit selinux + +DEPENDS += "${LIBSELINUX}" + +EXTRA_OEMAKE += "${@target_selinux(d, 'WITH_SELINUX=\"yes\"')}" -- cgit v1.2.3-54-g00ecf