From patchwork Sun Sep 30 00:19:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [03/12] populate_sdk_base: Update extraction script for multilibs Date: Sun, 30 Sep 2012 00:19:09 -0000 From: Mark Hatle X-Patchwork-Id: 37481 Message-Id: <0a88f460fef5d86e2a3ec4158498f025c836cfa9.1348963477.git.mark.hatle@windriver.com> To: 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 --- meta/classes/populate_sdk_base.bbclass | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 6eb6726..1bc1438 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -158,8 +158,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 `find $target_sdk_dir/ -name "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 '"')