summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2017-08-22 14:34:24 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-23 12:06:52 +0100
commitb0ebd9cbaf3da15c3682b5da2a485b2300440cab (patch)
treeeff31fec3376f14760094a76941eee6905331afd
parentea98124bfd4d6504162645d99325d3ef10229761 (diff)
downloadpoky-b0ebd9cbaf3da15c3682b5da2a485b2300440cab.tar.gz
initscripts: split sushell into sub package
* sushell is required by systemd service debug-shell when selinux is enabled, but it doesn't make sense to make systemd depend on initscripts, so split sushell into sub package initscripts-sushell. * The bash dependency has been removed by: ''' 4917e36a77bd6821b45db52caa43939d344d92f6 initscripts: Fix regression for requiring /bin/bash ''' so remove bash from RDEPENDS when selinux is enabled. (From OE-Core rev: 9c84ca86f396886ae68774032724b53664ecf0ed) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/initscripts/initscripts_1.0.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index 7ab0d2bd41..d627d2e30f 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -46,11 +46,12 @@ inherit update-alternatives
46DEPENDS_append = " update-rc.d-native" 46DEPENDS_append = " update-rc.d-native"
47PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" 47PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}"
48 48
49PACKAGES =+ "${PN}-functions" 49PACKAGES =+ "${PN}-functions ${PN}-sushell"
50RDEPENDS_${PN} = "${PN}-functions \ 50RDEPENDS_${PN} = "${PN}-functions \
51 ${@bb.utils.contains('DISTRO_FEATURES','selinux','bash','',d)} \ 51 ${@bb.utils.contains('DISTRO_FEATURES','selinux','${PN}-sushell','',d)} \
52 " 52 "
53FILES_${PN}-functions = "${sysconfdir}/init.d/functions*" 53FILES_${PN}-functions = "${sysconfdir}/init.d/functions*"
54FILES_${PN}-sushell = "${base_sbindir}/sushell"
54 55
55ALTERNATIVE_PRIORITY_${PN}-functions = "90" 56ALTERNATIVE_PRIORITY_${PN}-functions = "90"
56ALTERNATIVE_${PN}-functions = "functions" 57ALTERNATIVE_${PN}-functions = "functions"