diff options
author | Saul Wold <sgw@linux.intel.com> | 2014-05-29 15:00:54 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-10 17:12:18 +0100 |
commit | d4c5f1260108aa7114f8c447ab4ac7de7bffd333 (patch) | |
tree | c1dda2b9950e8bc5a49e6b040b1d9553ab0ae9e5 | |
parent | 7e6902963f936dd92db7bdf42444410570a76ed5 (diff) | |
download | poky-d4c5f1260108aa7114f8c447ab4ac7de7bffd333.tar.gz |
util-linux: add sulogin to alternatives list
sulogin is provided by both busybox in /sbin/sulogin and util-linux provides one
in /usr/sbin/sulogin, so move util-linux's to sbin and setup ALTERNATIVE_LINK.
[YOCTO #6384]
(From OE-Core rev: a827ca74d27b916df8d40ec8155bc0340f8a0487)
(From OE-Core rev: 92f0657a89087a4a388030fdb04aaad80aca918d)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index ad7aac7900..0498c05588 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -132,7 +132,7 @@ do_install () { | |||
132 | mkdir -p ${D}${base_bindir} | 132 | mkdir -p ${D}${base_bindir} |
133 | 133 | ||
134 | sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" | 134 | sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" |
135 | sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk readprofile fsck blkid blockdev fstrim" | 135 | sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk readprofile fsck blkid blockdev fstrim sulogin" |
136 | usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice utmpdump wall setsid chrt flock getopt" | 136 | usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice utmpdump wall setsid chrt flock getopt" |
137 | binprogs_a="dmesg kill more umount mount login reset su" | 137 | binprogs_a="dmesg kill more umount mount login reset su" |
138 | 138 | ||
@@ -166,7 +166,7 @@ ALTERNATIVE_PRIORITY = "100" | |||
166 | 166 | ||
167 | ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root" | 167 | ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root" |
168 | ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall" | 168 | ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall" |
169 | ALTERNATIVE_${PN} += "setsid chrt flock hwclock utmpdump eject getopt" | 169 | ALTERNATIVE_${PN} += "setsid chrt flock hwclock utmpdump eject getopt sulogin" |
170 | 170 | ||
171 | ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" | 171 | ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" |
172 | ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" | 172 | ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" |
@@ -177,6 +177,7 @@ ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" | |||
177 | ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix" | 177 | ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix" |
178 | ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" | 178 | ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" |
179 | ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" | 179 | ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" |
180 | ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" | ||
180 | ALTERNATIVE_TARGET[getopt] = "${bindir}/getopt" | 181 | ALTERNATIVE_TARGET[getopt] = "${bindir}/getopt" |
181 | 182 | ||
182 | ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1 reset.1" | 183 | ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1 reset.1" |