summaryrefslogtreecommitdiffstats
path: root/meta/files/toolchain-shar-extract.sh
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-12-04 15:42:50 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-08 10:20:47 +0000
commit68d3dfe8070b3f14f798420a0b68dd573be6ca08 (patch)
treed9941f64d7850777cc49d766b37a6a930dbdd303 /meta/files/toolchain-shar-extract.sh
parent0c5d2398fca382a0cbdc73adf50e741cef2287bc (diff)
downloadpoky-68d3dfe8070b3f14f798420a0b68dd573be6ca08.tar.gz
toolchain-shar-extract.sh: proper fix for additional env setup scripts
buildtools-tarball uses a custom env setup script, which isn't named the same as the default; thus unfortunately OE-Core revision a36469c97c9cb335de1e95dea5141038f337df95 broke installation of buildtools-tarball. Revert that and implement a more robust mechanism. (From OE-Core rev: 00e081b81ba8118959b724269ba9d18d42aba8a4) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/files/toolchain-shar-extract.sh')
-rw-r--r--meta/files/toolchain-shar-extract.sh11
1 files changed, 11 insertions, 0 deletions
diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh
index 8ef2b77557..ef47a6ea0c 100644
--- a/meta/files/toolchain-shar-extract.sh
+++ b/meta/files/toolchain-shar-extract.sh
@@ -171,9 +171,20 @@ echo "done"
171 171
172printf "Setting it up..." 172printf "Setting it up..."
173# fix environment paths 173# fix environment paths
174real_env_setup_script=""
174for env_setup_script in `ls $target_sdk_dir/environment-setup-*`; do 175for env_setup_script in `ls $target_sdk_dir/environment-setup-*`; do
176 if grep -q 'OECORE_NATIVE_SYSROOT=' $env_setup_script; then
177 # Handle custom env setup scripts that are only named
178 # environment-setup-* so that they have relocation
179 # applied - what we want beyond here is the main one
180 # rather than the one that simply sorts last
181 real_env_setup_script="$env_setup_script"
182 fi
175 $SUDO_EXEC sed -e "s:@SDKPATH@:$target_sdk_dir:g" -i $env_setup_script 183 $SUDO_EXEC sed -e "s:@SDKPATH@:$target_sdk_dir:g" -i $env_setup_script
176done 184done
185if [ -n "$real_env_setup_script" ] ; then
186 env_setup_script="$real_env_setup_script"
187fi
177 188
178@SDK_POST_INSTALL_COMMAND@ 189@SDK_POST_INSTALL_COMMAND@
179 190