[oe-commits] Sergey Lapin : util-linux-ng-blkid: proper busybox blkid replacement

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: be39fdaa4d8b788b16f281844976cf1577e7113a
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=be39fdaa4d8b788b16f281844976cf1577e7113a

Author: Sergey Lapin <slapin at ossfans.org>
Date:   Mon Apr 12 19:20:11 2010 +0400

util-linux-ng-blkid: proper busybox blkid replacement

/sbin/blkid is provided by both bisybox and util-linux-ng-blkid package,
but at different paths. Busybox version does not accept any options (ignores),
which partially leads to attempted access to /dev/mtdblock0 on OMAP
architecture, which by itself leads to excess error messages from mtd layer
due to different ECC methods (OMAP processor requirement for booting).
If using util-linux-ng-blkid, plus a small patch to udev rules
(http://markmail.org/message/454coplvll4vf3jf) this issue can be fixed.

---

 recipes/util-linux-ng/util-linux-ng.inc |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
index e4acd36..6f8e9b3 100644
--- a/recipes/util-linux-ng/util-linux-ng.inc
+++ b/recipes/util-linux-ng/util-linux-ng.inc
@@ -8,7 +8,7 @@ inherit autotools
 
 DEFAULT_PREFERENCE = "-1"
 
-INC_PR = "r20"
+INC_PR = "r21"
 
 # allows for a release candidate
 RC ?= ""
@@ -53,7 +53,7 @@ FILES_util-linux-ng-umount = "${base_bindir}/umount.${PN}"
 # Moved to ${base_sbindir} by do_install:
 FILES_util-linux-ng-readprofile = "${base_sbindir}/readprofile.${PN}"
 FILES_util-linux-ng-fsck = "${base_sbindir}/fsck.${PN}"
-FILES_util-linux-ng-blkid = "${sbindir}/blkid"
+FILES_util-linux-ng-blkid = "${base_sbindir}/blkid.${PN}"
 FILES_${PN}-mountall = "${sysconfdir}/default/mountall.${PN}"
 
 RREPLACES_util-linux-ng-blkid = "e2fsprogs-blkid"
@@ -124,7 +124,7 @@ do_install () {
 	mkdir -p ${D}${base_bindir}
 
         sbinprogs="agetty blockdev ctrlaltdel cfdisk vipw vigr"
-        sbinprogs_a="pivot_root hwclock mkswap shutdown mkfs.minix fsck.minix losetup swapon fdisk readprofile fsck"
+        sbinprogs_a="pivot_root hwclock mkswap shutdown mkfs.minix fsck.minix losetup swapon fdisk readprofile fsck blkid"
         usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice wall"
         binprogs_a="dmesg kill more umount mount login reset"
 
@@ -291,4 +291,12 @@ pkg_prerm_util-linux-ng-fsck () {
 	update-alternatives --remove fsck fsck.${PN}
 }
 
+pkg_postinst_util-linux-ng-blkid () {
+	update-alternatives --install ${base_sbindir}/blkid blkid blkid.${PN} 100
+}
+
+pkg_prerm_util-linux-ng-blkid () {
+	update-alternatives --remove blkid blkid.${PN}
+}
+
 BBCLASSEXTEND = "native"