util-linux: add sulogin to alternatives list
PATCH 1/1 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]
Signed-off-by Saul Wold <[email protected]>
--- meta/recipes-core/util-linux/util-linux.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
meta/recipes-core/util-linux/util-linux.inc +3 -2
@@ -132,7 +132,7 @@ do_install () { mkdir -p ${D}${base_bindir} 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" 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} += "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[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[eject] = "${bindir}/eject" ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" +ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" ALTERNATIVE_TARGET[getopt] = "${bindir}/getopt" ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1 reset.1"
Signature · 1 line
1.8.3.1
Quoted 6 lines · Saul Wold
sulogin is provided by both busybox in
/sbin/suloginand util-linux provides one in/usr/sbin/sulogin, so move util-linux's to sbin and setupALTERNATIVE_LINK.[YOCTO #6384]
Signed-off-by Saul Wold <[email protected]>
I verified that the util-linux sulogin is now the default if available.
I did not boot the resulting filesystem
(build) tested-by: Mark Hatle <[email protected]>
Quoted 35 lines
--- meta/recipes-core/util-linux/util-linux.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)meta/recipes-core/util-linux/util-linux.inc +3
-2@@ -132,7 +132,7 @@ do_install () { mkdir -p ${D}${base_bindir} 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" 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} += "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[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[eject] = "${bindir}/eject" ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" +ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" ALTERNATIVE_TARGET[getopt] = "${bindir}/getopt" ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1 reset.1"