On 2015年07月06日 16:47, Kai Kang wrote:
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.k...@windriver.com>
---
meta/recipes-core/initscripts/initscripts-1.0/sushell | 5 +++++
meta/recipes-core/initscripts/initscripts_1.0.bb | 10 +++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-core/initscripts/initscripts-1.0/sushell
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/sushell
b/meta/recipes-core/initscripts/initscripts-1.0/sushell
new file mode 100644
index 0000000..7d96941
--- /dev/null
+++ b/meta/recipes-core/initscripts/initscripts-1.0/sushell
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+[ -z "$SUSHELL" ] && SUSHELL=/bin/bash
+
+exec $SUSHELL
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb
b/meta/recipes-core/initscripts/initscripts_1.0.bb
index a086591..c2e815f 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 \
file://GPLv2.patch \
file://dmesg.sh \
file://logrotate-dmesg.conf \
+
${@bb.utils.contains('DISTRO_FEATURES','systemd','file://sushell','',d)} \
It should check distro feature selinux rather than systemd that only
when selinux is enabled, debug-shell.service from systemd starts with
sushell.
I'll send V2.
Thanks,
Kai
"
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','systemd','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','systemd','true','false',d)};
then
+ install -d ${D}/${base_sbindir}
+ install -m 0755 ${WORKDIR}/sushell ${D}/${base_sbindir}
+ fi
#
# Install device dependent scripts
#
--
Regards,
Neil | Kai Kang
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
