From: Mark Hatle Date: Wed, 26 Sep 2012 23:02:06 +0000 (-0500) Subject: populate_sdk_base: Update extraction script for multilibs X-Git-Tag: 2015-4~8774 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=6f0537c835c35dcff5154de0bec066ec3e71a4f8;p=openembedded-core.git 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 Signed-off-by: Saul Wold --- 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 '"')