summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/initscripts
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 08:49:54 +0100
commit9c84ca86f396886ae68774032724b53664ecf0ed (patch)
tree16b9c39abe1c1c5eef77612e79219c25b8893ad6 /meta/recipes-core/initscripts
parentf1414d6f9c327547023375f9e298f6f021eaee1b (diff)
downloadopenembedded-core-contrib-9c84ca86f396886ae68774032724b53664ecf0ed.tar.gz
openembedded-core-contrib-9c84ca86f396886ae68774032724b53664ecf0ed.tar.bz2
openembedded-core-contrib-9c84ca86f396886ae68774032724b53664ecf0ed.zip
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. Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/initscripts')
-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
DEPENDS_append = " update-rc.d-native"
PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}"
-PACKAGES =+ "${PN}-functions"
+PACKAGES =+ "${PN}-functions ${PN}-sushell"
RDEPENDS_${PN} = "${PN}-functions \
- ${@bb.utils.contains('DISTRO_FEATURES','selinux','bash','',d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES','selinux','${PN}-sushell','',d)} \
"
FILES_${PN}-functions = "${sysconfdir}/init.d/functions*"
+FILES_${PN}-sushell = "${base_sbindir}/sushell"
ALTERNATIVE_PRIORITY_${PN}-functions = "90"
ALTERNATIVE_${PN}-functions = "functions"