summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2013-03-20 16:09:10 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-03 17:01:13 +0100
commit27296bd8e6759c2f94477c14787837a761f16163 (patch)
tree4192bd7e07757a470581c160115ee9b412c1cee9 /meta/recipes-core
parent3e4655d951d38b0f216b286bb49f8a0276ba112d (diff)
downloadpoky-27296bd8e6759c2f94477c14787837a761f16163.tar.gz
util-linux: Use u-a for getopt
* when enable busybox installs getopt to ${base_bindir} and util-linux to ${bindir}, so there is no file conflict, but because busybox implementation does not support --long used by lsb_release (which RDEPENDS on util-linux) we need to use util-linux getopt even when busybox defconfig has it enabled (From OE-Core rev: 2dcc867247b402bb4223cc7b9861088958599866) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc6
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.22.2.bb2
2 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 46daab7fec..dd9c5466d4 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -117,7 +117,7 @@ do_install () {
117 117
118 sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" 118 sbinprogs="agetty ctrlaltdel cfdisk vipw vigr"
119 sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon fdisk readprofile fsck blkid blockdev" 119 sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon fdisk readprofile fsck blkid blockdev"
120 usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice utmpdump wall setsid chrt flock" 120 usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice utmpdump wall setsid chrt flock getopt"
121 binprogs_a="dmesg kill more umount mount login reset" 121 binprogs_a="dmesg kill more umount mount login reset"
122 122
123 if [ "${base_sbindir}" != "${sbindir}" ]; then 123 if [ "${base_sbindir}" != "${sbindir}" ]; then
@@ -153,7 +153,7 @@ ALTERNATIVE_PRIORITY = "100"
153 153
154ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root" 154ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root"
155ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall" 155ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall"
156ALTERNATIVE_${PN} += "setsid chrt flock hwclock utmpdump eject" 156ALTERNATIVE_${PN} += "setsid chrt flock hwclock utmpdump eject getopt"
157 157
158ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" 158ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg"
159ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" 159ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
@@ -163,6 +163,8 @@ ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev"
163ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" 163ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
164ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix" 164ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix"
165ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" 165ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
166ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt"
167ALTERNATIVE_TARGET[getopt] = "${bindir}/getopt"
166 168
167ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1" 169ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1"
168 170
diff --git a/meta/recipes-core/util-linux/util-linux_2.22.2.bb b/meta/recipes-core/util-linux/util-linux_2.22.2.bb
index 9b94a4773d..43a55a6db7 100644
--- a/meta/recipes-core/util-linux/util-linux_2.22.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.22.2.bb
@@ -1,5 +1,5 @@
1MAJOR_VERSION = "2.22" 1MAJOR_VERSION = "2.22"
2PR = "r2" 2PR = "r3"
3require util-linux.inc 3require util-linux.inc
4 4
5SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ 5SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \