[oe-commits] [openembedded-core] 41/44: util-linux: fix register location for rfkill to avoid conflict

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit e01107c5da395a32f9a017f8ee8cc8421c5671e0
Author: Chen Qi <Qi.Chen at windriver.com>
AuthorDate: Thu Nov 23 13:55:40 2017 +0800

    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 at windriver.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-core/util-linux/util-linux.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.