aboutsummaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2017-11-23 13:55:40 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-02 11:24:38 +0000
commite01107c5da395a32f9a017f8ee8cc8421c5671e0 (patch)
tree929a0a3c9f50d330b2294d1f94b57452c5f3833e /meta
parent867ac1370b294bfd1ee31f94abb63688f77081a1 (diff)
downloadopenembedded-core-e01107c5da395a32f9a017f8ee8cc8421c5671e0.zip
openembedded-core-e01107c5da395a32f9a017f8ee8cc8421c5671e0.tar.gz
openembedded-core-e01107c5da395a32f9a017f8ee8cc8421c5671e0.tar.bz2
util-linux: fix register location for rfkill to avoid conflict
If we have 'wifi' in distro feature, then busybox would have rfkill enabled. And we would have the following do_rootfs failure if we install both busybox and util-linux-rfkill. Error: cannot register alternative rfkill to /usr/bin/rfkill since it is already registered to /usr/sbin/rfkill. There's another provider of rfkill in OE, that is rfkill recipe in meta-oe. And it also registers rfkill to ${sbindir}/rfkill. So change the register location of rfkill in util-linux to avoid conflict with busybox and rfkill recipes. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 03970e9..248e8be 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -269,7 +269,7 @@ ALTERNATIVE_util-linux-blkid = "blkid"
ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid"
ALTERNATIVE_util-linux-rfkill = "rfkill"
-ALTERNATIVE_LINK_NAME[rfkill] = "${bindir}/rfkill"
+ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill"
ALTERNATIVE_TARGET[rfkill] = "${base_bindir}/rfkill"
ALTERNATIVE_util-linux-getopt = "getopt"