diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-12-04 15:42:50 +1300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-08 10:20:47 +0000 |
| commit | 68d3dfe8070b3f14f798420a0b68dd573be6ca08 (patch) | |
| tree | d9941f64d7850777cc49d766b37a6a930dbdd303 /meta/files/toolchain-shar-relocate.sh | |
| parent | 0c5d2398fca382a0cbdc73adf50e741cef2287bc (diff) | |
| download | poky-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-relocate.sh')
| -rw-r--r-- | meta/files/toolchain-shar-relocate.sh | 2 |
1 files changed, 0 insertions, 2 deletions
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*") |