diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2012-12-04 02:31:13 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-05 15:32:30 +0000 |
| commit | fa5be9499f047f492cc6b07abf16908e321b259e (patch) | |
| tree | e417ab10e667a2cbd2956df42770b3aed031cb0f | |
| parent | 10457e343b27e63b35e0278b00e9c25106b0cc1b (diff) | |
| download | openembedded-core-fa5be9499f047f492cc6b07abf16908e321b259e.tar.gz openembedded-core-fa5be9499f047f492cc6b07abf16908e321b259e.tar.bz2 openembedded-core-fa5be9499f047f492cc6b07abf16908e321b259e.zip | |
util-linux: use u-a for eject
* 2.22.1 now builds eject which conflicts with eject from eject recipe in meta-oe
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.22.1.bb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 058f06fbc2..30d80e5fc5 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -136,7 +136,7 @@ ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN} = "dmesg kill more reset mkswap blockdev pivot_root" ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall" -ALTERNATIVE_${PN} += "setsid chrt flock hwclock utmpdump" +ALTERNATIVE_${PN} += "setsid chrt flock hwclock utmpdump eject" ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" @@ -147,6 +147,7 @@ ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" 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" # There seems to be problem, atleast on nslu2, with these, untill they are # fixed the busybox ones have higher priority diff --git a/meta/recipes-core/util-linux/util-linux_2.22.1.bb b/meta/recipes-core/util-linux/util-linux_2.22.1.bb index c72634dc96..0177bba260 100644 --- a/meta/recipes-core/util-linux/util-linux_2.22.1.bb +++ b/meta/recipes-core/util-linux/util-linux_2.22.1.bb @@ -1,5 +1,5 @@ MAJOR_VERSION = "2.22" -PR = "r0" +PR = "r1" require util-linux.inc # note that `lscpu' is under GPLv3+ |