[oe-commits] Robert Yang : e2fsprogs/populate-extfs.sh: fix a problem on dash
git at git.openembedded.org
git at git.openembedded.org
Tue Jan 21 10:50:25 UTC 2014
Module: openembedded-core.git
Branch: master-next
Commit: 22f90c5aec4f0b0360d1d960226f9965d83d589b
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=22f90c5aec4f0b0360d1d960226f9965d83d589b
Author: Robert Yang <liezhi.yang at windriver.com>
Date: Mon Jan 20 20:24:43 2014 +0800
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 at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
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 7de720b..9b55a4b 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
More information about the Openembedded-commits
mailing list