[oe-commits] Koen Kooi : e2fsprogs: use u-a for blkid as well

[GIT User account]

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

Author: Koen Kooi <koen at openembedded.org>
Date:   Tue Feb  3 13:49:50 2009 +0100

e2fsprogs: use u-a for blkid as well

---

 packages/e2fsprogs/e2fsprogs_1.38.bb |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/e2fsprogs/e2fsprogs_1.38.bb b/packages/e2fsprogs/e2fsprogs_1.38.bb
index c92b488..4957ba7 100644
--- a/packages/e2fsprogs/e2fsprogs_1.38.bb
+++ b/packages/e2fsprogs/e2fsprogs_1.38.bb
@@ -1,6 +1,6 @@
 require e2fsprogs.inc
 
-PR = "r17"
+PR = "r18"
 
 SRC_URI += "file://no-hardlinks.patch;patch=1 \
 	    file://mkinstalldirs.patch;patch=1 \
@@ -36,7 +36,7 @@ do_stage () {
 RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-badblocks"
 
 PACKAGES =+ "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks"
-FILES_e2fsprogs-blkid = "${base_sbindir}/blkid"
+FILES_e2fsprogs-blkid = "${base_sbindir}/blkid.${PN}"
 FILES_e2fsprogs-uuidgen = "${bindir}/uuidgen"
 FILES_e2fsprogs-fsck = "${base_sbindir}/fsck.${PN}"
 FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck.${PN} ${base_sbindir}/fsck.ext*.${PN}"
@@ -46,6 +46,7 @@ FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
 
 do_install_append () {
 	mv ${D}${base_sbindir}/fsck ${D}${base_sbindir}/fsck.${PN}
+	mv ${D}${base_sbindir}/blkid ${D}${base_sbindir}/blkid.${PN}
 	mv ${D}${base_sbindir}/e2fsck ${D}${base_sbindir}/e2fsck.${PN}
 	mv ${D}${base_sbindir}/fsck.ext2 ${D}${base_sbindir}/fsck.ext2.${PN}
 	mv ${D}${base_sbindir}/fsck.ext3 ${D}${base_sbindir}/fsck.ext3.${PN}
@@ -62,6 +63,14 @@ pkg_prerm_e2fsprogs-fsck () {
 	update-alternatives --remove fsck fsck.${PN}
 }
 
+pkg_postinst_e2fsprogs-blkid () {
+    update-alternatives --install ${base_sbindir}/blkid blkid blkid.${PN} 100
+}
+
+pkg_prerm_e2fsprogs-blkid () {
+    update-alternatives --remove blkid blkid.${PN}
+}
+
 pkg_postinst_e2fsprogs-e2fsck () {
 	update-alternatives --install ${base_sbindir}/e2fsck e2fsck e2fsck.${PN} 100
 	update-alternatives --install ${base_sbindir}/fsck.ext2 fsck.ext2 fsck.ext2.${PN} 100