summaryrefslogtreecommitdiff
path: root/meta/files
diff options
context:
space:
mode:
authorGeorge Nita <george.nita@enea.com>2015-11-25 16:28:45 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-01 21:30:53 +0000
commit6d2074d477596971dc52027dd87b02af7f39138d (patch)
tree4b548e2b15cc3bbc699b3068da0ec17877ffff7a /meta/files
parent654f4785f719552f4e78e14a5a901c07d00ce68d (diff)
downloadopenembedded-core-6d2074d477596971dc52027dd87b02af7f39138d.tar.gz
openembedded-core-6d2074d477596971dc52027dd87b02af7f39138d.tar.bz2
openembedded-core-6d2074d477596971dc52027dd87b02af7f39138d.zip
toolchain-shar-extract.sh: Ensure it's ran in clean environment
Fixes [YOCTO #8698] -- https://bugzilla.yoctoproject.org/show_bug.cgi?id=8698 If prior to running the toolchain installation script a toolchain environment script is sourced then the toolchain installation will fail. This because the environment is now set for the sourced toolchain and doesn't suit the installation. In particular PATH points to the toolchain executables. The fix makes the script recursively call itself a second time with a clean environment. Tested by sourcing a previous successfully installed environment, erasing the previous installation directory and then reinstalling in the same directory. Signed-off-by: George Nita <george.nita@enea.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/files')
-rw-r--r--meta/files/toolchain-shar-extract.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh
index 954b6b3f6b..8ef2b77557 100644
--- a/meta/files/toolchain-shar-extract.sh
+++ b/meta/files/toolchain-shar-extract.sh
@@ -1,5 +1,7 @@
#!/bin/sh
+[ -z "$ENVCLEANED" ] && exec /usr/bin/env -i ENVCLEANED=1 "$0" "$@"
+
INST_ARCH=$(uname -m | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/")
SDK_ARCH=$(echo @SDK_ARCH@ | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/")