mirror of
https://git.yoctoproject.org/poky
synced 2026-04-16 15:32:13 +02:00
util-linux: add switch_root to alternatives list
switch_root is provided by both busybox in /sbin/switch_root and util-linux provides one in /usr/sbin/switch_root, so move util-linux's to sbin and setup ALTERNATIVE_LINK. (From OE-Core rev: cac818f0ecd0553b59b967a94766534643fecdf4) (From OE-Core rev: 812e525ce46c7e4e87ab2e6509376235dd3523df) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
89398c3e07
commit
4eab67dda8
@@ -135,7 +135,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 sulogin"
|
||||
sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk readprofile fsck blkid blockdev fstrim sulogin switch_root"
|
||||
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"
|
||||
|
||||
@@ -167,7 +167,7 @@ inherit update-alternatives
|
||||
|
||||
ALTERNATIVE_PRIORITY = "100"
|
||||
|
||||
ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root"
|
||||
ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root"
|
||||
ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall"
|
||||
ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject getopt sulogin"
|
||||
|
||||
@@ -177,6 +177,7 @@ ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more"
|
||||
ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap"
|
||||
ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev"
|
||||
ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
|
||||
ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root"
|
||||
ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix"
|
||||
ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
|
||||
ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt"
|
||||
|
||||
Reference in New Issue
Block a user