summaryrefslogtreecommitdiffstats
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:25:34 +0000
commitcf27466726aa713395e68e6dad988c19612e6328 (patch)
tree2aaa9b49ddad695a65dc4d606c4ff18bd0eb5d98 /meta
parentfae2e2f42de8212e90f75ac0035ffb65db10bb6c (diff)
downloadpoky-cf27466726aa713395e68e6dad988c19612e6328.tar.gz
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. (From OE-Core rev: e01107c5da395a32f9a017f8ee8cc8421c5671e0) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 03970e95c9..248e8bee95 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"
269ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" 269ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid"
270 270
271ALTERNATIVE_util-linux-rfkill = "rfkill" 271ALTERNATIVE_util-linux-rfkill = "rfkill"
272ALTERNATIVE_LINK_NAME[rfkill] = "${bindir}/rfkill" 272ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill"
273ALTERNATIVE_TARGET[rfkill] = "${base_bindir}/rfkill" 273ALTERNATIVE_TARGET[rfkill] = "${base_bindir}/rfkill"
274 274
275ALTERNATIVE_util-linux-getopt = "getopt" 275ALTERNATIVE_util-linux-getopt = "getopt"