From 5175d9a6955c1783fc35ab6832b6be4cbb9fc01b Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 8 Dec 2015 15:42:38 +1300 Subject: toolchain-shar-extract.sh: ensure cleaned environment will work for ext SDK In OE-Core revision 6d2074d477596971dc52027dd87b02af7f39138d we added a line which re-executes the script with a cleaned environment using env -i; unfortunately that caused a regression in the extensible SDK on Ubuntu 14.04 - strangely, there it seems that the value you get for PATH under env -i contains '.' which triggers a sanity check failure when preparing the build system. Do a belt-and-braces fix - source /etc/environment if it exists (so you get a more complete PATH value) and then filter any nastiness out of PATH for good measure. (Ubuntu 15.04 doesn't seem to suffer from the same problem.) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/files/toolchain-shar-extract.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index ef47a6ea0c..606a44e2f9 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -1,6 +1,8 @@ #!/bin/sh [ -z "$ENVCLEANED" ] && exec /usr/bin/env -i ENVCLEANED=1 "$0" "$@" +[ -f /etc/environment ] && . /etc/environment +export PATH=`echo "$PATH" | sed -e 's/:\.//' -e 's/::/:/'` 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 1.2.3-korg