[oe-commits] Richard Purdie : Revert "e2fsprogs/populate-extfs.sh: fix a problem on dash"

git at git.openembedded.org git at git.openembedded.org
Thu Jan 23 10:25:13 UTC 2014


Module: openembedded-core.git
Branch: master
Commit: c36607b62fa7eef5d0494df5aa77666605559723
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c36607b62fa7eef5d0494df5aa77666605559723

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Thu Jan 23 10:28:32 2014 +0000

Revert "e2fsprogs/populate-extfs.sh: fix a problem on dash"

This reverts commit 22f90c5aec4f0b0360d1d960226f9965d83d589b.

This causes build failures with:

| dirname: missing operand
| Try 'dirname --help' for more information.

under some circumstances.

---

 meta/recipes-devtools/e2fsprogs/e2fsprogs/populate-extfs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/populate-extfs.sh b/meta/recipes-devtools/e2fsprogs/e2fsprogs/populate-extfs.sh
index 9b55a4b..7de720b 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/populate-extfs.sh
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/populate-extfs.sh
@@ -23,7 +23,7 @@ DEBUGFS="debugfs"
 	find $SRCDIR | while read FILE; do
                 TGT="${FILE##*/}"
                 DIR="${FILE#$SRCDIR}"
-                DIR="$(dirname $DIR)"
+                DIR="${DIR%$TGT}"
 
 		# Skip the root dir
 		[ ! -z "$DIR" ] || continue



More information about the Openembedded-commits mailing list