summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2015-03-03 08:40:47 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-16 17:42:01 +0000
commitc5fd5773e877b9cbd4e07e2aa24f596ba144229f (patch)
tree66ee9d02e7824d64c1fba5b58fec7bbe9d981ec9
parentc212977a5555c85a80c0adf9ae59330b36ff67ad (diff)
downloadpoky-c5fd5773e877b9cbd4e07e2aa24f596ba144229f.tar.gz
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 (From OE-Core rev: 8e59d9e2c9c94d8682208ee02a1566864aaf51ff) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc6
1 files 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 3d8a4d0374..dd607ef03e 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"
83FILES_util-linux-partx = "${sbindir}/partx" 83FILES_util-linux-partx = "${sbindir}/partx"
84FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" 84FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}"
85FILES_util-linux-findfs = "${sbindir}/findfs" 85FILES_util-linux-findfs = "${sbindir}/findfs"
86FILES_util-linux-getopt = "${bindir}/getopt.${BPN}" 86FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}"
87 87
88FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" 88FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*"
89FILES_util-linux-libmount = "${base_libdir}/libmount.so.*" 89FILES_util-linux-libmount = "${base_libdir}/libmount.so.*"
@@ -139,8 +139,7 @@ do_install () {
139 139
140 sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" 140 sbinprogs="agetty ctrlaltdel cfdisk vipw vigr"
141 sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root" 141 sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root"
142 usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice utmpdump wall setsid chrt flock getopt readprofile" 142 binprogs_a="dmesg getopt kill more umount mount login reset su"
143 binprogs_a="dmesg kill more umount mount login reset su"
144 143
145 if [ "${base_sbindir}" != "${sbindir}" ]; then 144 if [ "${base_sbindir}" != "${sbindir}" ]; then
146 mkdir -p ${D}${base_sbindir} 145 mkdir -p ${D}${base_sbindir}
@@ -234,6 +233,7 @@ ALTERNATIVE_LINK_NAME[reset] = "${bindir}/reset"
234ALTERNATIVE_TARGET[reset] = "${base_bindir}/reset" 233ALTERNATIVE_TARGET[reset] = "${base_bindir}/reset"
235 234
236ALTERNATIVE_util-linux-getopt = "getopt" 235ALTERNATIVE_util-linux-getopt = "getopt"
236ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt"
237 237
238BBCLASSEXTEND = "native nativesdk" 238BBCLASSEXTEND = "native nativesdk"
239 239