[oe-commits] Chen Qi : populate-extfs.sh: fix to handle /var/lib/opkg/alternatives/[[ correctly
git at git.openembedded.org
git at git.openembedded.org
Tue Jun 24 10:05:58 UTC 2014
Module: openembedded-core.git
Branch: dora
Commit: 8277c71747758e2ba0815a6f5cd11c9e0c9c90ce
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=8277c71747758e2ba0815a6f5cd11c9e0c9c90ce
Author: Chen Qi <Qi.Chen at windriver.com>
Date: Thu Jun 19 10:11:32 2014 +0800
populate-extfs.sh: fix to handle /var/lib/opkg/alternatives/[[ correctly
There was a patch trying to fix this problem by using 'dirname', but it
caused some build failures, thus got reverted.
The problem is that $DIR might be empty and we should first do the check
before trying to use $(dirname $DIR).
[YOCTO #5712]
Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/populate-extfs.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/populate-extfs.sh b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/populate-extfs.sh
index 7de720b..da3954e 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/populate-extfs.sh
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/populate-extfs.sh
@@ -23,12 +23,13 @@ DEBUGFS="debugfs"
find $SRCDIR | while read FILE; do
TGT="${FILE##*/}"
DIR="${FILE#$SRCDIR}"
- DIR="${DIR%$TGT}"
# Skip the root dir
[ ! -z "$DIR" ] || continue
[ ! -z "$TGT" ] || continue
+ DIR="$(dirname $DIR)"
+
if [ "$DIR" != "$CWD" ]; then
echo "cd $DIR"
CWD="$DIR"
More information about the Openembedded-commits
mailing list