diff options
| author |   Andreas Oberritter <obi@opendreambox.org> | 2010-12-21 16:45:14 +0000 |
|---|---|---|
| committer |   Thomas Zimmermann <zimmermann@vdm-design.de> | 2011-03-05 09:34:01 +0100 |
| commit | a1193d12a8d0e9bb41e87e1c28c82b1fd7034ad3 (patch) | |
| tree | 36e9a6640ba6d5946e61d253eccfbc70a11a27f9 | |
| parent | 942bbaa1bf02863e3590d3b7a79851bfe8ded531 (diff) | |
| download | openembedded-a1193d12a8d0e9bb41e87e1c28c82b1fd7034ad3.tar.gz | |
e2fsprogs: fix symlink creation
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | recipes/e2fsprogs/e2fsprogs.inc | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/recipes/e2fsprogs/e2fsprogs.inc b/recipes/e2fsprogs/e2fsprogs.inc index 1366ce73d6..ef9aace321 100644 --- a/recipes/e2fsprogs/e2fsprogs.inc +++ b/recipes/e2fsprogs/e2fsprogs.inc @@ -9,7 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz" S = "${WORKDIR}/e2fsprogs-${PV}" -INC_PR = "r25" +INC_PR = "r26" inherit autotools @@ -30,33 +30,26 @@ do_compile_prepend () { do_install_append () { oe_runmake install-libs DESTDIR=${D} + ln -sf ${D}/${base_sbindir}/tune2fs findfs + ln -sf ${D}/${base_sbindir}/tune2fs e2label +} - mv ${D}${base_sbindir}/e2fsck ${D}${base_sbindir}/e2fsck.${PN} - rm ${D}${base_sbindir}/fsck.ext2 - rm ${D}${base_sbindir}/fsck.ext3 - rm ${D}${base_sbindir}/fsck.ext4* - mv ${D}${base_sbindir}/mke2fs ${D}${base_sbindir}/mke2fs.${PN} - rm ${D}${base_sbindir}/mkfs.ext2 - rm ${D}${base_sbindir}/mkfs.ext3 - rm ${D}${base_sbindir}/mkfs.ext4* - mv ${D}${base_sbindir}/uuidd ${D}${base_sbindir}/uuidd.${PN} - - cd ${D}/${base_sbindir} - ln -sf ./e2fsck.${PN} fsck.ext2.${PN} - ln -sf ./e2fsck.${PN} fsck.ext3.${PN} - ln -sf ./e2fsck.${PN} fsck.ext4.${PN} - ln -sf ./e2fsck.${PN} fsck.ext4dev.${PN} - ln -sf ./mke2fs.${PN} mkfs.ext2.${PN} - ln -sf ./mke2fs.${PN} mkfs.ext3.${PN} - ln -sf ./mke2fs.${PN} mkfs.ext4.${PN} - ln -sf ./mke2fs.${PN} mkfs.ext4dev.${PN} - - ln -sf ./tune2fs findfs - ln -sf ./tune2fs e2label - - mv ${D}${bindir}/chattr ${D}${bindir}/chattr.${PN} +do_install_append_pn-e2fsprogs () { + for f in e2fsck mke2fs uuidd; do + mv ${D}${base_sbindir}/$f ${D}${base_sbindir}/$f.${PN} + done + for f in chattr; do + mv ${D}${bindir}/$f ${D}${bindir}/$f.${PN} + done + fsck=$(cd ${D}${base_sbindir}/ && ls -1 fsck.ext* | sed s/[^\.]*//) + for e in $fsck; do + rm ${D}${base_sbindir}/{fsck,mkfs}$e; + ln -s ${D}${base_sbindir}/e2fsck$e.${PN}$e fsck$e.${PN} + ln -s ${D}${base_sbindir}/mke2fs$e.${PN}$e mkfs$e.${PN} + done } + pkg_postinst_e2fsprogs () { update-alternatives --install ${base_bindir}/chattr chattr chattr.${PN} 100 update-alternatives --install ${base_sbindir}/uuidd uuidd uuidd.${PN} 10 |