[oe-commits] Thomas Zimmermann : e2fsprogs: fix cherry-pick errors

[git version control]

Module: openembedded.git
Branch: shr/testing2011.1
Commit: 6612daf198db3afc3455b7374ebec9d2eb2b6fc8
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=6612daf198db3afc3455b7374ebec9d2eb2b6fc8

Author: Thomas Zimmermann <zimmermann at vdm-design.de>
Date:   Sat Mar  5 09:37:17 2011 +0100

e2fsprogs: fix cherry-pick errors

---

 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 2aeda29..66efa7d 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
 }