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:05 +0000 |
| commit | 00e081b81ba8118959b724269ba9d18d42aba8a4 (patch) | |
| tree | 9a62614f2e9031ae8fa62a26ca6c15ff9d245d95 | |
| parent | 9a3b992b7339f7aa892f1dff7d159747630b045d (diff) | |
| download | openembedded-core-00e081b81ba8118959b724269ba9d18d42aba8a4.tar.gz openembedded-core-00e081b81ba8118959b724269ba9d18d42aba8a4.tar.bz2 openembedded-core-00e081b81ba8118959b724269ba9d18d42aba8a4.zip | |
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.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -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 8ef2b77557..ef47a6ea0c 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -171,9 +171,20 @@ echo "done" printf "Setting it up..." # fix environment paths +real_env_setup_script="" for env_setup_script in `ls $target_sdk_dir/environment-setup-*`; do + if grep -q 'OECORE_NATIVE_SYSROOT=' $env_setup_script; then + # Handle custom env setup scripts that are only named + # environment-setup-* so that they have relocation + # applied - what we want beyond here is the main one + # rather than the one that simply sorts last + real_env_setup_script="$env_setup_script" + fi $SUDO_EXEC sed -e "s:@SDKPATH@:$target_sdk_dir:g" -i $env_setup_script done +if [ -n "$real_env_setup_script" ] ; then + env_setup_script="$real_env_setup_script" +fi @SDK_POST_INSTALL_COMMAND@ 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 @@ -#reset the env_setup_script value to the proper value -env_setup_script=$target_sdk_dir/environment-setup-@REAL_MULTIMACH_TARGET_SYS@ # fix dynamic loader paths in all ELF SDK binaries native_sysroot=$($SUDO_EXEC cat $env_setup_script |grep 'OECORE_NATIVE_SYSROOT='|cut -d'=' -f2|tr -d '"') dl_path=$($SUDO_EXEC find $native_sysroot/lib -name "ld-linux*") |