From 22f90c5aec4f0b0360d1d960226f9965d83d589b Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Mon, 20 Jan 2014 20:24:43 +0800 Subject: e2fsprogs/populate-extfs.sh: fix a problem on dash The dash can't handle the or [[ in parameter expansion, for example: A=/usr/bin/[[ B=[[ C="${A%$B}" The C should be "/usr/bin" in common, but it will be /usr/bin/[[ on dash, use dirname to fix it. NOTE: There are 3 lines about parameter expansion, only fix the DIR="${DIR%$TGT}" since the other 2 works will and are very useful in this case. [YOCTO #5712] Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- 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 7de720b115..9b55a4b912 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="${DIR%$TGT}" + DIR="$(dirname $DIR)" # Skip the root dir [ ! -z "$DIR" ] || continue -- cgit 1.2.3-korg