summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2014-12-02 04:40:38 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-05 18:01:06 +0000
commit3cbe382e55fd0aaacc33385a2d104d11028651d2 (patch)
tree922fd8ab08f7314c9ef50200c83abdfda4907079 /meta/recipes-core
parent5e215923652b3bd540c305cf8294b78a7c966efa (diff)
downloadpoky-3cbe382e55fd0aaacc33385a2d104d11028651d2.tar.gz
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) 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>
Diffstat (limited to 'meta/recipes-core')
-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 a37efe904e..e6c00e437e 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -136,7 +136,7 @@ do_install () {
136 mkdir -p ${D}${base_bindir} 136 mkdir -p ${D}${base_bindir}
137 137
138 sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" 138 sbinprogs="agetty ctrlaltdel cfdisk vipw vigr"
139 sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk readprofile fsck blkid blockdev fstrim sulogin" 139 sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk readprofile fsck blkid blockdev fstrim sulogin switch_root"
140 usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice utmpdump wall setsid chrt flock getopt" 140 usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice utmpdump wall setsid chrt flock getopt"
141 binprogs_a="dmesg kill more umount mount login reset su" 141 binprogs_a="dmesg kill more umount mount login reset su"
142 142
@@ -168,7 +168,7 @@ inherit update-alternatives
168 168
169ALTERNATIVE_PRIORITY = "100" 169ALTERNATIVE_PRIORITY = "100"
170 170
171ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root" 171ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root"
172ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall" 172ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall"
173ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject sulogin" 173ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject sulogin"
174 174
@@ -178,6 +178,7 @@ ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more"
178ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" 178ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap"
179ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" 179ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev"
180ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" 180ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
181ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root"
181ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix" 182ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix"
182ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" 183ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
183ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" 184ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin"