mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-01 15:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

util-linux: fix register location for rfkill to avoid conflict

Browse Source 
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>
This commit is contained in:
Chen Qi
2017-11-23 13:55:40 +08:00
committed by Richard Purdie
parent fae2e2f42d
commit cf27466726
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-core/util-linux/util-linux.inc
View File

@@ -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"