summaryrefslogtreecommitdiffstats
path: root/meta/files
diff options
context:
space:
mode:
authorBrendan Le Foll <brendan.le.foll@intel.com>2015-09-07 13:42:17 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-09 14:27:40 +0100
commitf5f9185344df1408e4bccfecd352373522721910 (patch)
tree136a652da28bd10bb9ee92396305fd878114c295 /meta/files
parent6b41b7cc323e3bed2d0545019e7bdc8e006db1e9 (diff)
downloadopenembedded-core-contrib-f5f9185344df1408e4bccfecd352373522721910.tar.gz
openembedded-core-contrib-f5f9185344df1408e4bccfecd352373522721910.tar.bz2
openembedded-core-contrib-f5f9185344df1408e4bccfecd352373522721910.zip
toolchain-shar-extract.sh: ensure extensible SDK install path obeys restrictions
There are some characters that cannot appear in the installation path, so we need to check for these (From OE-Core rev: 5aa9314c342004797e96c87868c5491ad70c13f9) Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/files')
-rw-r--r--meta/files/toolchain-shar-extract.sh15
1 files changed, 12 insertions, 3 deletions
diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh
index 3a50991031..85719fa4ab 100644
--- a/meta/files/toolchain-shar-extract.sh
+++ b/meta/files/toolchain-shar-extract.sh
@@ -85,9 +85,18 @@ else
target_sdk_dir=$(readlink -m "$target_sdk_dir")
fi
-if [ -n "$(echo $target_sdk_dir|grep ' ')" ]; then
- echo "The target directory path ($target_sdk_dir) contains spaces. Abort!"
- exit 1
+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
+ echo "The target directory path ($target_sdk_dir) contains illegal" \
+ "characters such as spaces, @ or +. Abort!"
+ exit 1
+ fi
+else
+ if [ -n "$(echo $target_sdk_dir|grep ' ')" ]; then
+ echo "The target directory path ($target_sdk_dir) contains spaces. Abort!"
+ exit 1
+ fi
fi
if [ -e "$target_sdk_dir/environment-setup-@REAL_MULTIMACH_TARGET_SYS@" ]; then