From 8d784baf25861161a3bdc513e2f5236c0c19710d Mon Sep 17 00:00:00 2001 From: George Nita Date: Wed, 25 Nov 2015 16:28:45 +0100 Subject: 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. (From OE-Core rev: 6d2074d477596971dc52027dd87b02af7f39138d) Signed-off-by: George Nita Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/files/toolchain-shar-extract.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta/files') 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/") -- cgit v1.2.3-54-g00ecf