[OE-core] [PATCH 03/12] populate_sdk_base: Update extraction script for multilibs

[Richard Purdie]

On Sat, 2012-09-29 at 19:19 -0500, Mark Hatle wrote:
> 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 at windriver.com>
> ---
>  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 '"')

This is on course to conflict with 

http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=1b6019086c4242c550b4e0551c7b5d206a0d52e1

Can you please talk with Laurentiu and come up with a solution that
works for everyone.

Cheers,

Richard