summaryrefslogtreecommitdiffstats
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 16:57:21 +0100
commit514ec3123bede648e15c1382bf2491de4f597552 (patch)
treedb4a8385237d02fabf36b43ee67d51dd3b1c694e
parent8421aede4fdd5132eb953a59099670f9ab1f7f01 (diff)
downloadpoky-514ec3123bede648e15c1382bf2491de4f597552.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. (From OE-Core rev: 5c4922d5a3bc4a5aaa807d9e65210d0c01c9bdef) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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"
207 207
208ALTERNATIVE_${PN} = " \ 208ALTERNATIVE_${PN} = " \
209 dmesg kill more mkswap blockdev pivot_root switch_root \ 209 dmesg kill more mkswap blockdev pivot_root switch_root \
210 hexdump last lastb logger mesg renice wall unshare \ 210 hexdump last lastb logger mesg renice wall \
211 setsid chrt flock utmpdump eject nologin taskset fallocate \ 211 setsid chrt flock utmpdump eject nologin taskset fallocate \
212 fsfreeze nsenter \ 212 fsfreeze nsenter \
213" 213"
@@ -220,7 +220,6 @@ ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev"
220ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" 220ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
221ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" 221ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root"
222ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" 222ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
223ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare"
224ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate" 223ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate"
225ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" 224ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze"
226ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" 225ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin"
@@ -292,6 +291,9 @@ ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin"
292ALTERNATIVE_util-linux-mountpoint = "mountpoint" 291ALTERNATIVE_util-linux-mountpoint = "mountpoint"
293ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" 292ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint"
294 293
294ALTERNATIVE_util-linux-unshare = "unshare"
295ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare"
296
295BBCLASSEXTEND = "native nativesdk" 297BBCLASSEXTEND = "native nativesdk"
296 298
297python do_package_prepend () { 299python do_package_prepend () {