From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.windriver.com ([147.11.1.11]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1TIhcD-00018q-SL for openembedded-core@lists.openembedded.org; Mon, 01 Oct 2012 17:09:02 +0200 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail.windriver.com (8.14.5/8.14.3) with ESMTP id q91Eu0Pi012217 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL); Mon, 1 Oct 2012 07:56:00 -0700 (PDT) Received: from Marks-MacBook-Pro.local (172.25.36.234) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server id 14.2.309.2; Mon, 1 Oct 2012 07:56:00 -0700 Message-ID: <5069AEFF.5080707@windriver.com> Date: Mon, 1 Oct 2012 09:55:59 -0500 From: Mark Hatle Organization: Wind River Systems User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:15.0) Gecko/20120907 Thunderbird/15.0.1 MIME-Version: 1.0 To: Richard Purdie References: <0a88f460fef5d86e2a3ec4158498f025c836cfa9.1348963477.git.mark.hatle@windriver.com> <1349097436.15753.99.camel@ted> In-Reply-To: <1349097436.15753.99.camel@ted> Cc: openembedded-core@lists.openembedded.org Subject: Re: [PATCH 03/12] populate_sdk_base: Update extraction script for multilibs X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Oct 2012 15:09:02 -0000 Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit On 10/1/12 8:17 AM, Richard Purdie wrote: > 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 >> --- >> 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. I think this is a better fix for the problem. The other change limits the environment file to a single file. However, there is nothing in the function -- other then the use of 'env_setuo_script' -- that wants or needs a single file loaded. So it's better to find htem all and just iterate over them all. Also the order of processing, and the last item processed does not matter. The later chunks of functionality just look for a static value that is supposed to be the same in all of the environment files. --Mark > Cheers, > > Richard >