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:32 +0000
commit42f1d64c8e6fc9cbdc6b126a224bd33ff6c48c19 (patch)
tree19127517d5597cfa356a234acebf389502660f9e
parentc2cbe0f60e6d19ab9a8321be74d636d2c36671a8 (diff)
downloadpoky-42f1d64c8e6fc9cbdc6b126a224bd33ff6c48c19.tar.gz
sysvinit: use ALTERNATIVE to manage sulogin
Busybox also provides sulogin command, so we need to use the ALTERNATIVE mechanism to manage it. (From OE-Core rev: 8b3a799a87d18b1d113d59b3e7a681db5683e5f8) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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"
44ALTERNATIVE_${PN}-pidof = "pidof" 44ALTERNATIVE_${PN}-pidof = "pidof"
45ALTERNATIVE_LINK_NAME[pidof] = "${base_bindir}/pidof" 45ALTERNATIVE_LINK_NAME[pidof] = "${base_bindir}/pidof"
46 46
47ALTERNATIVE_${PN}-sulogin = "sulogin"
48ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin"
49
47ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1" 50ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1"
48 51
49ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" 52ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1"
@@ -56,7 +59,7 @@ ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1"
56PACKAGES =+ "sysvinit-pidof sysvinit-sulogin" 59PACKAGES =+ "sysvinit-pidof sysvinit-sulogin"
57FILES_${PN} += "${base_sbindir}/* ${base_bindir}/*" 60FILES_${PN} += "${base_sbindir}/* ${base_bindir}/*"
58FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5" 61FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5"
59FILES_sysvinit-sulogin = "${base_sbindir}/sulogin" 62FILES_sysvinit-sulogin = "${base_sbindir}/sulogin.sysvinit"
60 63
61RDEPENDS_${PN} += "sysvinit-pidof" 64RDEPENDS_${PN} += "sysvinit-pidof"
62 65