diff options
| author |   Koen Kooi <koen@openembedded.org> | 2009-02-03 13:49:50 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-02-03 13:49:50 +0100 |
| commit | 0a33914e7db6715664090702ff32992041cea49b (patch) | |
| tree | 6e30c3f12de1d3168ebbd9239e03e3d28b903e23 | |
| parent | a994b2b2461e68967e35193892a8dd2098ae5b34 (diff) | |
| download | openembedded-0a33914e7db6715664090702ff32992041cea49b.tar.gz | |
e2fsprogs: use u-a for blkid as well
| -rw-r--r-- | 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 c92b48856f..4957ba775b 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 |