summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-09-26 18:02:06 -0500
committerSaul Wold <sgw@linux.intel.com>2012-10-26 09:12:15 -0700
commit6f0537c835c35dcff5154de0bec066ec3e71a4f8 (patch)
treefa42f71c5958245ab0fa576423ab1c0e4d2a0816
parent15834451525453e0f7ceac25d4f98117f1825f37 (diff)
downloadopenembedded-core-6f0537c835c35dcff5154de0bec066ec3e71a4f8.tar.gz
openembedded-core-6f0537c835c35dcff5154de0bec066ec3e71a4f8.tar.bz2
openembedded-core-6f0537c835c35dcff5154de0bec066ec3e71a4f8.zip
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. Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-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"
printf "Setting it up..."
# fix environment paths
-env_setup_script=$(find $target_sdk_dir/ -name "environment-setup-${REAL_MULTIMACH_TARGET_SYS}")
-sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" -i $env_setup_script
+for env_setup_script in `ls $target_sdk_dir/environment-setup-*`; do
+ sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" -i $env_setup_script
+done
# fix dynamic loader paths in all ELF SDK binaries
native_sysroot=$(cat $env_setup_script |grep OECORE_NATIVE_SYSROOT|cut -d'=' -f2|tr -d '"')