diff options
| author | Brendan Le Foll <brendan.le.foll@intel.com> | 2015-09-07 13:42:17 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-07 16:10:58 +0100 |
| commit | 5aa9314c342004797e96c87868c5491ad70c13f9 (patch) | |
| tree | 255646af03778e37dd9d468f42d6daf117063a74 | |
| parent | 2694d2f17d597b44fcc7aed5f6836081fa88a6b3 (diff) | |
| download | openembedded-core-5aa9314c342004797e96c87868c5491ad70c13f9.tar.gz openembedded-core-5aa9314c342004797e96c87868c5491ad70c13f9.tar.bz2 openembedded-core-5aa9314c342004797e96c87868c5491ad70c13f9.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
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>
| -rw-r--r-- | meta/files/toolchain-shar-extract.sh | 15 |
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 |