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.

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/populate-extfs.sh b/meta/recipes-devtools/e2fsprogs/e2fsprogs/populate-extfs.sh
index 9b55a4b912013551cd5412d6a3ef60ae1fba8856..7de720b115a8c1f75b714586a5056f576a5917f9 100644 (file)
--- 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