[oe-commits] Martin Jansa : util-linux: move getopt u-a link to base_bindir

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 8e59d9e2c9c94d8682208ee02a1566864aaf51ff
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=8e59d9e2c9c94d8682208ee02a1566864aaf51ff

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Tue Mar  3 08:40:47 2015 +0100

util-linux: move getopt u-a link to base_bindir

* busybox installs getopt u-a in base_bindir when GETOPT is enabled, move util-linux
  link to the same location to fix calling u-a in read-only images
* remove unused variable usrbinprogs_a

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/recipes-core/util-linux/util-linux.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 3d8a4d0..dd607ef 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -83,7 +83,7 @@ FILES_util-linux-reset = "${base_bindir}/reset"
 FILES_util-linux-partx = "${sbindir}/partx"
 FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}"
 FILES_util-linux-findfs = "${sbindir}/findfs"
-FILES_util-linux-getopt = "${bindir}/getopt.${BPN}"
+FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}"
 
 FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*"
 FILES_util-linux-libmount = "${base_libdir}/libmount.so.*"
@@ -139,8 +139,7 @@ do_install () {
 
         sbinprogs="agetty ctrlaltdel cfdisk vipw vigr"
         sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root"
-        usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice utmpdump wall setsid chrt flock getopt readprofile"
-        binprogs_a="dmesg kill more umount mount login reset su"
+        binprogs_a="dmesg getopt kill more umount mount login reset su"
 
         if [ "${base_sbindir}" != "${sbindir}" ]; then
         	mkdir -p ${D}${base_sbindir}
@@ -234,6 +233,7 @@ ALTERNATIVE_LINK_NAME[reset] = "${bindir}/reset"
 ALTERNATIVE_TARGET[reset] = "${base_bindir}/reset"
 
 ALTERNATIVE_util-linux-getopt = "getopt"
+ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt"
 
 BBCLASSEXTEND = "native nativesdk"