]> code.ossystems Code Review - openembedded-core.git/commitdiff
initscripts: add /sbin/sushell for systemd service debug-shell
authorKai Kang <kai.kang@windriver.com>
Wed, 8 Jul 2015 06:26:00 +0000 (14:26 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 8 Jul 2015 14:22:26 +0000 (15:22 +0100)
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]

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/initscripts/initscripts-1.0/sushell [new file with mode: 0644]
meta/recipes-core/initscripts/initscripts_1.0.bb

diff --git a/meta/recipes-core/initscripts/initscripts-1.0/sushell b/meta/recipes-core/initscripts/initscripts-1.0/sushell
new file mode 100644 (file)
index 0000000..7d96941
--- /dev/null
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+[ -z "$SUSHELL" ] && SUSHELL=/bin/bash
+
+exec $SUSHELL
index a086591b80c20a78e00bdc733d950fcf99a2fcdf..b1d917da6ad49e25b0551dc15f468533b5225f38 100644 (file)
@@ -33,6 +33,7 @@ SRC_URI = "file://functions \
            file://GPLv2.patch \
            file://dmesg.sh \
            file://logrotate-dmesg.conf \
+           ${@bb.utils.contains('DISTRO_FEATURES','selinux','file://sushell','',d)} \
 "
 
 S = "${WORKDIR}"
@@ -46,7 +47,9 @@ DEPENDS_append = " update-rc.d-native"
 DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}"
 
 PACKAGES =+ "${PN}-functions"
-RDEPENDS_${PN} = "${PN}-functions"
+RDEPENDS_${PN} = "${PN}-functions \
+                  ${@bb.utils.contains('DISTRO_FEATURES','selinux','bash','',d)} \
+                "
 FILES_${PN}-functions = "${sysconfdir}/init.d/functions*"
 
 ALTERNATIVE_PRIORITY_${PN}-functions = "90"
@@ -104,6 +107,11 @@ do_install () {
        if [ "${TARGET_ARCH}" = "arm" ]; then
                install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d
        fi
+
+       if ${@bb.utils.contains('DISTRO_FEATURES','selinux','true','false',d)}; then
+               install -d ${D}/${base_sbindir}
+               install -m 0755 ${WORKDIR}/sushell ${D}/${base_sbindir}
+       fi
 #
 # Install device dependent scripts
 #