diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2014-12-02 04:40:38 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-31 10:18:58 +0000 |
commit | 4eab67dda8686417f4df992ef2ce41d8758c6afa (patch) | |
tree | d05f10e20a76cc008ff8c38faf9f2d3ec6e4cf04 | |
parent | 89398c3e071455e2bf8e9e130991868203138188 (diff) | |
download | poky-4eab67dda8686417f4df992ef2ce41d8758c6afa.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)
(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>
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 5 |
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 ffb84c4b64..2c299e8588 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -135,7 +135,7 @@ do_install () { | |||
135 | mkdir -p ${D}${base_bindir} | 135 | mkdir -p ${D}${base_bindir} |
136 | 136 | ||
137 | sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" | 137 | sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" |
138 | sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk readprofile fsck blkid blockdev fstrim sulogin" | 138 | sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk readprofile fsck blkid blockdev fstrim sulogin switch_root" |
139 | usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice utmpdump wall setsid chrt flock getopt" | 139 | usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice utmpdump wall setsid chrt flock getopt" |
140 | binprogs_a="dmesg kill more umount mount login reset su" | 140 | binprogs_a="dmesg kill more umount mount login reset su" |
141 | 141 | ||
@@ -167,7 +167,7 @@ inherit update-alternatives | |||
167 | 167 | ||
168 | ALTERNATIVE_PRIORITY = "100" | 168 | ALTERNATIVE_PRIORITY = "100" |
169 | 169 | ||
170 | ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root" | 170 | ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root" |
171 | ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall" | 171 | ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall" |
172 | ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject getopt sulogin" | 172 | ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject getopt sulogin" |
173 | 173 | ||
@@ -177,6 +177,7 @@ ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more" | |||
177 | ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" | 177 | ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" |
178 | ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" | 178 | ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" |
179 | ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" | 179 | ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" |
180 | ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" | ||
180 | ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix" | 181 | ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix" |
181 | ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" | 182 | ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" |
182 | ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" | 183 | ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" |