aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2014-06-19 10:11:32 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-24 10:57:32 +0100
commit8277c71747758e2ba0815a6f5cd11c9e0c9c90ce (patch)
treeb6814c5a223b2722bc7df0784f22c726bbb8bf62
parentb7371b49b4b83c2e864126480b65363fe9f2cfd2 (diff)
downloadopenembedded-core-8277c71747758e2ba0815a6f5cd11c9e0c9c90ce.zip
openembedded-core-8277c71747758e2ba0815a6f5cd11c9e0c9c90ce.tar.gz
openembedded-core-8277c71747758e2ba0815a6f5cd11c9e0c9c90ce.tar.bz2
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@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.8/populate-extfs.sh3
1 files changed, 2 insertions, 1 deletions
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"