aboutsummaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-11-02 15:51:46 +0000
committerRobert Yang <liezhi.yang@windriver.com>2015-12-27 23:03:15 -0800
commitd7bcdb33a675fbdd30596d62961be52aa98c9e05 (patch)
treedfa216996d56398b13f1933564b8ad1919f353f7 /meta
parent5c5953cbc44c7532650cb9e3c877fa86c9d0f242 (diff)
downloadopenembedded-core-contrib-d7bcdb33a675fbdd30596d62961be52aa98c9e05.tar.gz
toolchain-shar-extract.sh: do not allow $ in paths for ext SDK
If you put an $ character in the path, SDK installation fails during the preparation stage, so add this to the disallowed characters. Fixes [YOCTO #8625]. (From OE-Core master rev: 654f4785f719552f4e78e14a5a901c07d00ce68d) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/files/toolchain-shar-extract.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh
index 6af37b723a..35d3c75506 100644
--- a/meta/files/toolchain-shar-extract.sh
+++ b/meta/files/toolchain-shar-extract.sh
@@ -101,9 +101,9 @@ fi
if [ "$SDK_EXTENSIBLE" = "1" ]; then
# We're going to be running the build system, additional restrictions apply
- if echo "$target_sdk_dir" | grep -q '[+\ @]'; then
+ if echo "$target_sdk_dir" | grep -q '[+\ @$]'; then
echo "The target directory path ($target_sdk_dir) contains illegal" \
- "characters such as spaces, @ or +. Abort!"
+ "characters such as spaces, @, \$ or +. Abort!"
exit 1
fi
else