diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2017-08-22 14:34:24 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-23 12:06:52 +0100 |
commit | b0ebd9cbaf3da15c3682b5da2a485b2300440cab (patch) | |
tree | eff31fec3376f14760094a76941eee6905331afd /meta/recipes-core | |
parent | ea98124bfd4d6504162645d99325d3ef10229761 (diff) | |
download | poky-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>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/initscripts/initscripts_1.0.bb | 5 |
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 | |||
46 | DEPENDS_append = " update-rc.d-native" | 46 | DEPENDS_append = " update-rc.d-native" |
47 | PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" | 47 | PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" |
48 | 48 | ||
49 | PACKAGES =+ "${PN}-functions" | 49 | PACKAGES =+ "${PN}-functions ${PN}-sushell" |
50 | RDEPENDS_${PN} = "${PN}-functions \ | 50 | RDEPENDS_${PN} = "${PN}-functions \ |
51 | ${@bb.utils.contains('DISTRO_FEATURES','selinux','bash','',d)} \ | 51 | ${@bb.utils.contains('DISTRO_FEATURES','selinux','${PN}-sushell','',d)} \ |
52 | " | 52 | " |
53 | FILES_${PN}-functions = "${sysconfdir}/init.d/functions*" | 53 | FILES_${PN}-functions = "${sysconfdir}/init.d/functions*" |
54 | FILES_${PN}-sushell = "${base_sbindir}/sushell" | ||
54 | 55 | ||
55 | ALTERNATIVE_PRIORITY_${PN}-functions = "90" | 56 | ALTERNATIVE_PRIORITY_${PN}-functions = "90" |
56 | ALTERNATIVE_${PN}-functions = "functions" | 57 | ALTERNATIVE_${PN}-functions = "functions" |