summaryrefslogtreecommitdiffstats
path: root/meta/files
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-11-02 15:51:46 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-01 21:32:02 +0000
commit7f3c20f87d8e9113a14bbac3080cb6dee2469e8d (patch)
tree228a78aeaa1325854e0c941160873420a0cc2e33 /meta/files
parent2d21e5d233be168abfb0a6f9ef87a6ea7ddf007b (diff)
downloadopenembedded-core-contrib-7f3c20f87d8e9113a14bbac3080cb6dee2469e8d.tar.gz
openembedded-core-contrib-7f3c20f87d8e9113a14bbac3080cb6dee2469e8d.tar.bz2
openembedded-core-contrib-7f3c20f87d8e9113a14bbac3080cb6dee2469e8d.zip
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 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/files')
-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 98b9f1cd98..954b6b3f6b 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