diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2013-03-20 16:09:10 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-03 16:54:13 +0100 |
| commit | 2dcc867247b402bb4223cc7b9861088958599866 (patch) | |
| tree | 7571ba96dbc92182a4fd5748751b933336409908 | |
| parent | 0c80286a3383b436a0a63a0b00eb357dd9dea4fb (diff) | |
| download | openembedded-core-2dcc867247b402bb4223cc7b9861088958599866.tar.gz openembedded-core-2dcc867247b402bb4223cc7b9861088958599866.tar.bz2 openembedded-core-2dcc867247b402bb4223cc7b9861088958599866.zip | |
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
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 6 | ||||
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.22.2.bb | 2 |
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 () { sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon fdisk readprofile fsck blkid blockdev" - usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice utmpdump wall setsid chrt flock" + usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice utmpdump wall setsid chrt flock getopt" binprogs_a="dmesg kill more umount mount login reset" if [ "${base_sbindir}" != "${sbindir}" ]; then @@ -153,7 +153,7 @@ ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root" ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall" -ALTERNATIVE_${PN} += "setsid chrt flock hwclock utmpdump eject" +ALTERNATIVE_${PN} += "setsid chrt flock hwclock utmpdump eject getopt" ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" @@ -163,6 +163,8 @@ ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix" ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" +ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" +ALTERNATIVE_TARGET[getopt] = "${bindir}/getopt" ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1" 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 @@ MAJOR_VERSION = "2.22" -PR = "r2" +PR = "r3" require util-linux.inc SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ |