summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-05-29 15:00:54 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-01 14:29:31 +0100
commitfec42d37a879c7616ad26640a4991fd9108790db (patch)
treef9c2c0a8d94c9e27a688a40f5377f7f3831b3a4a
parentdf1dc4edc5bb5be762c56152cfc1979b587e5b3b (diff)
downloadpoky-fec42d37a879c7616ad26640a4991fd9108790db.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) 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.inc5
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 c2a3cf7104..83bb4a66b9 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
167ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root" 167ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root"
168ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall" 168ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall"
169ALTERNATIVE_${PN} += "setsid chrt flock hwclock utmpdump eject getopt" 169ALTERNATIVE_${PN} += "setsid chrt flock hwclock utmpdump eject getopt sulogin"
170 170
171ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" 171ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg"
172ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" 172ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
@@ -177,6 +177,7 @@ ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
177ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix" 177ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix"
178ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" 178ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
179ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" 179ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt"
180ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin"
180ALTERNATIVE_TARGET[getopt] = "${bindir}/getopt" 181ALTERNATIVE_TARGET[getopt] = "${bindir}/getopt"
181 182
182ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1 reset.1" 183ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1 reset.1"