summaryrefslogtreecommitdiffstats
path: root/meta/classes/populate_sdk_base.bbclass
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-09-26 18:02:06 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-27 09:44:55 +0100
commit26d966f34e9e4a65eaea20eebf761aa567daa495 (patch)
tree187eb8d9f284289263172cba11a7418b47c00405 /meta/classes/populate_sdk_base.bbclass
parent7e2ff7c0125b40631eee7aeacf59c938bca6d586 (diff)
downloadpoky-26d966f34e9e4a65eaea20eebf761aa567daa495.tar.gz
populate_sdk_base: Update extraction script for multilibs
When multilibs are enabled, there will be more then one environment file created. We need to be sure to process each environment file. The next function can simply use the last environment file processed to get the magic value(s) that it requires. (From OE-Core rev: 6f0537c835c35dcff5154de0bec066ec3e71a4f8) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/populate_sdk_base.bbclass')
-rw-r--r--meta/classes/populate_sdk_base.bbclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index a914a2c273..8258224019 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -160,8 +160,9 @@ echo "done"
160 160
161printf "Setting it up..." 161printf "Setting it up..."
162# fix environment paths 162# fix environment paths
163env_setup_script=$(find $target_sdk_dir/ -name "environment-setup-${REAL_MULTIMACH_TARGET_SYS}") 163for env_setup_script in `ls $target_sdk_dir/environment-setup-*`; do
164sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" -i $env_setup_script 164 sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" -i $env_setup_script
165done
165 166
166# fix dynamic loader paths in all ELF SDK binaries 167# fix dynamic loader paths in all ELF SDK binaries
167native_sysroot=$(cat $env_setup_script |grep OECORE_NATIVE_SYSROOT|cut -d'=' -f2|tr -d '"') 168native_sysroot=$(cat $env_setup_script |grep OECORE_NATIVE_SYSROOT|cut -d'=' -f2|tr -d '"')