summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/initscripts/initscripts_1.0.bb
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2015-07-08 14:26:00 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-09 18:00:20 +0100
commitfbe51e01f9c7da714c0602fb1e27ffeb05825b00 (patch)
treead688f17edd0e3929789769392596a35d2b78770 /meta/recipes-core/initscripts/initscripts_1.0.bb
parentfb9e6971f53fb09e89ad8bda89057ba23dc78601 (diff)
downloadpoky-fbe51e01f9c7da714c0602fb1e27ffeb05825b00.tar.gz
initscripts: add /sbin/sushell for systemd service debug-shell
Add file /sbin/sushell for systemd service debug-shell which starts with /bin/sushell when SELinux is enabled. Copy and add sushell file from Fedora 22. Add runtime dependency bash as well when systemd is enabled to eliminate QA warning: WARNING: QA Issue: /sbin/sushell_initscripts contained in package initscripts requires /bin/bash, but no providers found in its RDEPENDS [file-rdeps] (From OE-Core rev: a4b53872a8a9a2743299acbff015f7f2750a69d6) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/initscripts/initscripts_1.0.bb')
-rw-r--r--meta/recipes-core/initscripts/initscripts_1.0.bb10
1 files changed, 9 insertions, 1 deletions
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index a086591b80..b1d917da6a 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -33,6 +33,7 @@ SRC_URI = "file://functions \
33 file://GPLv2.patch \ 33 file://GPLv2.patch \
34 file://dmesg.sh \ 34 file://dmesg.sh \
35 file://logrotate-dmesg.conf \ 35 file://logrotate-dmesg.conf \
36 ${@bb.utils.contains('DISTRO_FEATURES','selinux','file://sushell','',d)} \
36" 37"
37 38
38S = "${WORKDIR}" 39S = "${WORKDIR}"
@@ -46,7 +47,9 @@ DEPENDS_append = " update-rc.d-native"
46DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" 47DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}"
47 48
48PACKAGES =+ "${PN}-functions" 49PACKAGES =+ "${PN}-functions"
49RDEPENDS_${PN} = "${PN}-functions" 50RDEPENDS_${PN} = "${PN}-functions \
51 ${@bb.utils.contains('DISTRO_FEATURES','selinux','bash','',d)} \
52 "
50FILES_${PN}-functions = "${sysconfdir}/init.d/functions*" 53FILES_${PN}-functions = "${sysconfdir}/init.d/functions*"
51 54
52ALTERNATIVE_PRIORITY_${PN}-functions = "90" 55ALTERNATIVE_PRIORITY_${PN}-functions = "90"
@@ -104,6 +107,11 @@ do_install () {
104 if [ "${TARGET_ARCH}" = "arm" ]; then 107 if [ "${TARGET_ARCH}" = "arm" ]; then
105 install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d 108 install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d
106 fi 109 fi
110
111 if ${@bb.utils.contains('DISTRO_FEATURES','selinux','true','false',d)}; then
112 install -d ${D}/${base_sbindir}
113 install -m 0755 ${WORKDIR}/sushell ${D}/${base_sbindir}
114 fi
107# 115#
108# Install device dependent scripts 116# Install device dependent scripts
109# 117#