From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 23 Jan 2014 10:28:32 +0000 (+0000)
Subject: Revert "e2fsprogs/populate-extfs.sh: fix a problem on dash"
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~34788
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c36607b62fa7eef5d0494df5aa77666605559723;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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 9b55a4b9120..7de720b115a 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