summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2018-10-11 17:04:08 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-12 08:44:05 +0100
commit5c4922d5a3bc4a5aaa807d9e65210d0c01c9bdef (patch)
tree5506163bb16ce0dc6e35070c4064b8ec0e098d5d /meta
parenta27a197ad4bb32fa93aa95e685e9e70ffe755811 (diff)
downloadopenembedded-core-5c4922d5a3bc4a5aaa807d9e65210d0c01c9bdef.tar.gz
util-linux: fix alternatives setting for unshare
The alternative setting for unshare belongs to the util-linux-unshare package instead of the util-linux package. Fix this problem to avoid a dead symlink /usr/bin/unshare -> /usr/bin/unshare.util-linux on target. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc6
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 45e2203a64..60ac9c2006 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -207,7 +207,7 @@ ALTERNATIVE_PRIORITY = "80"
ALTERNATIVE_${PN} = " \
dmesg kill more mkswap blockdev pivot_root switch_root \
- hexdump last lastb logger mesg renice wall unshare \
+ hexdump last lastb logger mesg renice wall \
setsid chrt flock utmpdump eject nologin taskset fallocate \
fsfreeze nsenter \
"
@@ -220,7 +220,6 @@ 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[unshare] = "${bindir}/unshare"
ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate"
ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze"
ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin"
@@ -292,6 +291,9 @@ ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin"
ALTERNATIVE_util-linux-mountpoint = "mountpoint"
ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint"
+ALTERNATIVE_util-linux-unshare = "unshare"
+ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare"
+
BBCLASSEXTEND = "native nativesdk"
python do_package_prepend () {