aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-01-20 20:24:43 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-21 10:35:19 +0000
commit22f90c5aec4f0b0360d1d960226f9965d83d589b (patch)
tree8f13f0e39b2db1584d0c1d780e9d24e9d328f909
parent8fcd5accbe8ffca9e0c5233419c1571741c76c03 (diff)
downloadopenembedded-core-contrib-22f90c5aec4f0b0360d1d960226f9965d83d589b.tar.gz
openembedded-core-contrib-22f90c5aec4f0b0360d1d960226f9965d83d589b.tar.bz2
openembedded-core-contrib-22f90c5aec4f0b0360d1d960226f9965d83d589b.zip
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 <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/populate-extfs.sh2
1 files changed, 1 insertions, 1 deletions
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