diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-12-04 15:42:50 +1300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-12 08:42:29 +0000 |
commit | 4b5d4ca1c969c5ef1f3764605c2a77d35a4a1870 (patch) | |
tree | e8ea180ad8898fb476db6382570c2805eb262463 /meta/files | |
parent | d2ea8f1041437043701d616cb9388affc2f4c512 (diff) | |
download | poky-4b5d4ca1c969c5ef1f3764605c2a77d35a4a1870.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 master rev: 00e081b81ba8118959b724269ba9d18d42aba8a4)
(From OE-Core rev: feefaceb8a2bce8129aba82d4d93e725656ee075)
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')
-rw-r--r-- | meta/files/toolchain-shar-extract.sh | 11 | ||||
-rw-r--r-- | meta/files/toolchain-shar-relocate.sh | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index 98b9f1cd98..6af37b723a 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh | |||
@@ -169,9 +169,20 @@ echo "done" | |||
169 | 169 | ||
170 | printf "Setting it up..." | 170 | printf "Setting it up..." |
171 | # fix environment paths | 171 | # fix environment paths |
172 | real_env_setup_script="" | ||
172 | for env_setup_script in `ls $target_sdk_dir/environment-setup-*`; do | 173 | for env_setup_script in `ls $target_sdk_dir/environment-setup-*`; do |
174 | if grep -q 'OECORE_NATIVE_SYSROOT=' $env_setup_script; then | ||
175 | # Handle custom env setup scripts that are only named | ||
176 | # environment-setup-* so that they have relocation | ||
177 | # applied - what we want beyond here is the main one | ||
178 | # rather than the one that simply sorts last | ||
179 | real_env_setup_script="$env_setup_script" | ||
180 | fi | ||
173 | $SUDO_EXEC sed -e "s:@SDKPATH@:$target_sdk_dir:g" -i $env_setup_script | 181 | $SUDO_EXEC sed -e "s:@SDKPATH@:$target_sdk_dir:g" -i $env_setup_script |
174 | done | 182 | done |
183 | if [ -n "$real_env_setup_script" ] ; then | ||
184 | env_setup_script="$real_env_setup_script" | ||
185 | fi | ||
175 | 186 | ||
176 | @SDK_POST_INSTALL_COMMAND@ | 187 | @SDK_POST_INSTALL_COMMAND@ |
177 | 188 | ||
diff --git a/meta/files/toolchain-shar-relocate.sh b/meta/files/toolchain-shar-relocate.sh index d58e4ed152..4ef2927171 100644 --- a/meta/files/toolchain-shar-relocate.sh +++ b/meta/files/toolchain-shar-relocate.sh | |||
@@ -1,5 +1,3 @@ | |||
1 | #reset the env_setup_script value to the proper value | ||
2 | env_setup_script=$target_sdk_dir/environment-setup-@REAL_MULTIMACH_TARGET_SYS@ | ||
3 | # fix dynamic loader paths in all ELF SDK binaries | 1 | # fix dynamic loader paths in all ELF SDK binaries |
4 | native_sysroot=$($SUDO_EXEC cat $env_setup_script |grep 'OECORE_NATIVE_SYSROOT='|cut -d'=' -f2|tr -d '"') | 2 | native_sysroot=$($SUDO_EXEC cat $env_setup_script |grep 'OECORE_NATIVE_SYSROOT='|cut -d'=' -f2|tr -d '"') |
5 | dl_path=$($SUDO_EXEC find $native_sysroot/lib -name "ld-linux*") | 3 | dl_path=$($SUDO_EXEC find $native_sysroot/lib -name "ld-linux*") |