summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <qi.chen@windriver.com>2013-11-15 18:45:43 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-20 14:03:05 +0000
commit8b3a799a87d18b1d113d59b3e7a681db5683e5f8 (patch)
treeb292c381621cb9a93661b407944cd371c676ea86
parent686ee2f13673d48d8c7666d4fa1806e98b037561 (diff)
downloadopenembedded-core-contrib-8b3a799a87d18b1d113d59b3e7a681db5683e5f8.tar.gz
openembedded-core-contrib-8b3a799a87d18b1d113d59b3e7a681db5683e5f8.tar.bz2
openembedded-core-contrib-8b3a799a87d18b1d113d59b3e7a681db5683e5f8.zip
sysvinit: use ALTERNATIVE to manage sulogin
Busybox also provides sulogin command, so we need to use the ALTERNATIVE mechanism to manage it. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
index 50842e2fb6..f2d5659e65 100644
--- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
@@ -44,6 +44,9 @@ ALTERNATIVE_LINK_NAME[poweroff] = "${base_sbindir}/poweroff"
ALTERNATIVE_${PN}-pidof = "pidof"
ALTERNATIVE_LINK_NAME[pidof] = "${base_bindir}/pidof"
+ALTERNATIVE_${PN}-sulogin = "sulogin"
+ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin"
+
ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1"
ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1"
@@ -56,7 +59,7 @@ ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1"
PACKAGES =+ "sysvinit-pidof sysvinit-sulogin"
FILES_${PN} += "${base_sbindir}/* ${base_bindir}/*"
FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5"
-FILES_sysvinit-sulogin = "${base_sbindir}/sulogin"
+FILES_sysvinit-sulogin = "${base_sbindir}/sulogin.sysvinit"
RDEPENDS_${PN} += "sysvinit-pidof"