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

The following changes since commit 72867393fe2004ab9f0ee23eb09a975c82938b9e:

runqemu: Also specialcase resolution of '.' to the file's location (2017-11-21 17:58:41 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib ChenQi/util-linux-rfkill
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/util-linux-rfkill

Chen Qi (1):
util-linux: fix register location for rfkill to avoid conflict

 meta/recipes-core/util-linux/util-linux.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

1.9.1

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.

---
 meta/recipes-core/util-linux/util-linux.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 03970e9..248e8be 100644
@@ -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"

1.9.1