diff options
| author | Randy MacLeod <Randy.MacLeod@windriver.com> | 2018-10-16 19:24:27 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-18 10:38:57 +0100 |
| commit | b8366a7057da8b880ca36c38999ef658594f4fde (patch) | |
| tree | 3dd2c84c0f0cf516bf705fd93dd22f2d73aabd4b | |
| parent | 62c7a970de40e8c4d57cb6d3feebbfbcae089b27 (diff) | |
| download | openembedded-core-b8366a7057da8b880ca36c38999ef658594f4fde.tar.gz openembedded-core-b8366a7057da8b880ca36c38999ef658594f4fde.tar.bz2 openembedded-core-b8366a7057da8b880ca36c38999ef658594f4fde.zip | |
util-linux: fix alternatives setting for switch-root
The alternative setting for switch_root belongs to the util-linux-switch-root
package instead of the util-linux package. Fix this problem to avoid
a dangling symlink:
/usr/bin/switch_root-> /usr/bin/switch_root.util-linux
on target and in the sdk.
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 60ac9c2006..3d8b3ff592 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -206,7 +206,7 @@ do_install_append_class-native () { ALTERNATIVE_PRIORITY = "80" ALTERNATIVE_${PN} = " \ - dmesg kill more mkswap blockdev pivot_root switch_root \ + dmesg kill more mkswap blockdev pivot_root \ hexdump last lastb logger mesg renice wall \ setsid chrt flock utmpdump eject nologin taskset fallocate \ fsfreeze nsenter \ @@ -218,7 +218,6 @@ 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[eject] = "${bindir}/eject" ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate" ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" @@ -294,6 +293,9 @@ ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" ALTERNATIVE_util-linux-unshare = "unshare" ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" +ALTERNATIVE_util-linux-switch-root = "switch_root" +ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" + BBCLASSEXTEND = "native nativesdk" python do_package_prepend () { |