[oe-commits] Chen Qi : sysvinit: use ALTERNATIVE to manage sulogin

git at git.openembedded.org git at git.openembedded.org
Wed Nov 20 14:03:03 UTC 2013


Module: openembedded-core.git
Branch: master
Commit: 8b3a799a87d18b1d113d59b3e7a681db5683e5f8
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=8b3a799a87d18b1d113d59b3e7a681db5683e5f8

Author: Chen Qi <qi.chen at windriver.com>
Date:   Fri Nov 15 18:45:43 2013 +0800

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 at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
index 50842e2..f2d5659 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"
 



More information about the Openembedded-commits mailing list