[oe-commits] Martin Jansa : util-linux-ng: use u-a for /sbin/blockdev

[git version control]

Module: openembedded.git
Branch: master
Commit: 3e4169d9a790c1a4ce83dc28fa5c551428874ea6
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=3e4169d9a790c1a4ce83dc28fa5c551428874ea6

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Sat Feb 12 19:12:13 2011 +0000

util-linux-ng: use u-a for /sbin/blockdev

* resolves conflict with latest busybox

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Acked-by: Koen Kooi <koen at openembedded.org>

---

 recipes/util-linux-ng/util-linux-ng.inc |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
index 579c8dc..51f25b2 100644
--- a/recipes/util-linux-ng/util-linux-ng.inc
+++ b/recipes/util-linux-ng/util-linux-ng.inc
@@ -6,7 +6,7 @@ DEPENDS_virtclass-native = "zlib-native lzo-native gettext-native"
 
 inherit autotools gettext
 
-INC_PR = "r35"
+INC_PR = "r36"
 
 # allows for a release candidate
 RC ?= ""
@@ -126,8 +126,8 @@ do_install () {
 		'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install
 	mkdir -p ${D}${base_bindir}
 
-        sbinprogs="agetty blockdev ctrlaltdel cfdisk"
-        sbinprogs_a="pivot_root hwclock mkswap shutdown mkfs.minix fsck.minix losetup swapon fdisk fsck blkid vigr vipw uuidd"
+        sbinprogs="agetty ctrlaltdel cfdisk"
+        sbinprogs_a="pivot_root hwclock mkswap shutdown mkfs.minix fsck.minix losetup swapon fdisk fsck blkid blockdev vigr vipw uuidd"
         usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice wall setsid chrt reset cal script flock"
         usrsbinprogs_a="readprofile"
         binprogs_a="dmesg kill more umount mount login"
@@ -220,6 +220,7 @@ pkg_postinst_${PN} () {
 	update-alternatives --install ${base_bindir}/login login login.${PN} 100
 	update-alternatives --install ${base_sbindir}/vipw vipw vipw.${PN} 100
 	update-alternatives --install ${base_sbindir}/vigr vigr vigr.${PN} 100
+	update-alternatives --install ${base_sbindir}/blockdev blockdev blockdev.${PN} 100
 	update-alternatives --install ${bindir}/setsid setsid setsid.${PN} 100
 	update-alternatives --install ${bindir}/chrt chrt chrt.${PN} 100
 	update-alternatives --install ${base_sbindir}/uuidd uuidd uuidd.${PN} 100
@@ -236,7 +237,7 @@ pkg_prerm_${PN} () {
 	test -x ${base_sbindir}/pivot_root.${PN} && \
 	update-alternatives --remove pivot_root pivot_root.${PN}
 
-	for i in dmesg kill more halt hwclock mkswap reboot shutdown sln mkfs.minix fsck.minix hexdump setsid chrt last logger mesg renice wall vipw vigr chfn newgrp chsh login cal script flock uuidd; do
+	for i in dmesg kill more halt hwclock mkswap reboot shutdown sln mkfs.minix fsck.minix hexdump setsid chrt last logger mesg renice wall vipw vigr blockdev chfn newgrp chsh login cal script flock uuidd; do
 		update-alternatives --remove $i $i.${PN}
 	done
 }