diff options
author | Thomas Zimmermann <zimmermann@vdm-design.de> | 2011-03-05 09:37:17 +0100 |
---|---|---|
committer | Thomas Zimmermann <zimmermann@vdm-design.de> | 2011-03-05 09:37:17 +0100 |
commit | 6612daf198db3afc3455b7374ebec9d2eb2b6fc8 (patch) | |
tree | e12dfb4894630c97eff6d5750d80c239f24ebe57 | |
parent | e6cf8f7ed45f47622a63897cd9e353457f789d8b (diff) | |
download | openembedded-6612daf198db3afc3455b7374ebec9d2eb2b6fc8.tar.gz |
e2fsprogs: fix cherry-pick errors
-rw-r--r-- | recipes/e2fsprogs/e2fsprogs.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes/e2fsprogs/e2fsprogs.inc b/recipes/e2fsprogs/e2fsprogs.inc index 2aeda298d4..66efa7d184 100644 --- a/recipes/e2fsprogs/e2fsprogs.inc +++ b/recipes/e2fsprogs/e2fsprogs.inc @@ -28,10 +28,9 @@ 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 + ln -sf tune2fs ${D}/${base_sbindir}/findfs + ln -sf tune2fs ${D}/${base_sbindir}/e2label } do_install_append_pn-e2fsprogs () { @@ -43,9 +42,10 @@ do_install_append_pn-e2fsprogs () { 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} + rm ${D}${base_sbindir}/fsck$e + rm ${D}${base_sbindir}/mkfs$e + ln -sf e2fsck.${PN} ${D}${base_sbindir}/fsck$e.${PN} + ln -sf mke2fs.${PN} ${D}${base_sbindir}/mkfs$e.${PN} done } |