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>
This commit is contained in:
parent
df1dc4edc5
commit
fec42d37a8
|
@ -132,7 +132,7 @@ do_install () {
|
||||||
mkdir -p ${D}${base_bindir}
|
mkdir -p ${D}${base_bindir}
|
||||||
|
|
||||||
sbinprogs="agetty ctrlaltdel cfdisk vipw vigr"
|
sbinprogs="agetty ctrlaltdel cfdisk vipw vigr"
|
||||||
sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk readprofile fsck blkid blockdev fstrim"
|
sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk readprofile fsck blkid blockdev fstrim sulogin"
|
||||||
usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice utmpdump wall setsid chrt flock getopt"
|
usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice utmpdump wall setsid chrt flock getopt"
|
||||||
binprogs_a="dmesg kill more umount mount login reset su"
|
binprogs_a="dmesg kill more umount mount login reset su"
|
||||||
|
|
||||||
|
@ -166,7 +166,7 @@ ALTERNATIVE_PRIORITY = "100"
|
||||||
|
|
||||||
ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root"
|
ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root"
|
||||||
ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall"
|
ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall"
|
||||||
ALTERNATIVE_${PN} += "setsid chrt flock hwclock utmpdump eject getopt"
|
ALTERNATIVE_${PN} += "setsid chrt flock hwclock utmpdump eject getopt sulogin"
|
||||||
|
|
||||||
ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg"
|
ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg"
|
||||||
ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
|
ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
|
||||||
|
@ -177,6 +177,7 @@ ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
|
||||||
ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix"
|
ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix"
|
||||||
ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
|
ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
|
||||||
ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt"
|
ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt"
|
||||||
|
ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin"
|
||||||
ALTERNATIVE_TARGET[getopt] = "${bindir}/getopt"
|
ALTERNATIVE_TARGET[getopt] = "${bindir}/getopt"
|
||||||
|
|
||||||
ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1 reset.1"
|
ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1 reset.1"
|
||||||
|
|
Loading…
Reference in New Issue