From: Martin Jansa Date: Tue, 4 Dec 2012 01:31:13 +0000 (+0100) Subject: util-linux: use u-a for eject X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~39309 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa5be9499f047f492cc6b07abf16908e321b259e;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 058f06fbc23..30d80e5fc56 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 c72634dc967..0177bba260d 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+