[OE-core] [PATCH 1/1] multilib.bbclass/package_manager.py: fix <multilib>-meta-toolchain build failure

[Hongxu Jia]

On 10/15/2014 09:27 PM, Laurentiu Palcu wrote:
> Hi Hongxu,
>
> Out of curiosity, was this broken since 2011? Because the commit you're
> mentioning is more than 3 years old and I'm not totally convinced that it's
> the one triggering the problem...

It failed after do_rootfs refactor, in previous version, the code of using
'DEFAULTTUNE_virtclass-multilib-lib32' by rpm located in
python __anonymous () {
}
which not invoking data_smart.finalize. At that time, everyting is ok.

//Hongxu

>> There is a failure to build lib32-meta-toolchain:
>> ...
>> |ERROR: lib32-packagegroup-core-standalone-sdk-target not found in the base
>> feeds (qemux86_64 x86 noarch any all).
>> ...
>>
>> In package_manager.py, the variable 'DEFAULTTUNE_virtclass-multilib-lib32'
>> is used to process multilib image/toolchain. But for the build of lib32-
>> meta-toolchain, the value of 'DEFAULTTUNE_virtclass-multilib-lib32' is
>> deleted. In 'bitbake lib32-meta-toolchain -e', we got:
>> ...
>> |# $DEFAULTTUNE_virtclass-multilib-lib32 [2 operations]
>> |#   set? /home/jiahongxu/yocto/build-20141010-yocto/conf/local.conf:237
>> |#     "x86"
>> |#   del data_smart.py:406 [finalize]
>> |#     ""
>> |# pre-expansion value:
>> |#   "None"
>> ...
>>
>> The commit 899d45b90061eb3cf3e71029072eee42cd80930c in oe-core deleted
>> it at DataSmart.finalize
>> ...
>> Author: Richard Purdie <richard.purdie at linuxfoundation.org>
>> Date:   Tue May 31 23:52:50 2011 +0100
>>
>>      bitbake/data_smart: Change overrides behaviour to remove
>>         expanded variables from the datastore
>> ...
>>
>> We add an internal variable 'DEFAULTTUNE_ML_<multilib>', assign it with the
>> value of 'DEFAULTTUNE_virtclass-multilib-lib32' before deleting.
>>
>> For rpm backend in package_manager.py, we use DEFAULTTUNE_virtclass-multilib
>> -lib32 first, if it is not available, and try to use DEFAULTTUNE_ML_<multilib>
>>
>> [YOCTO #6842]
>>
>> Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
>> ---
>>   meta/classes/multilib.bbclass  | 1 +
>>   meta/lib/oe/package_manager.py | 3 +++
>>   2 files changed, 4 insertions(+)
>>
>> diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
>> index 6e143dd..6aad894 100644
>> --- a/meta/classes/multilib.bbclass
>> +++ b/meta/classes/multilib.bbclass
>> @@ -60,6 +60,7 @@ python multilib_virtclass_handler () {
>>       newtune = e.data.getVar("DEFAULTTUNE_" + "virtclass-multilib-" + variant, False)
>>       if newtune:
>>           e.data.setVar("DEFAULTTUNE", newtune)
>> +        e.data.setVar('DEFAULTTUNE_ML_%s' % variant, newtune)
>>   }
>>   
>>   addhandler multilib_virtclass_handler
>> diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
>> index 27fdf26..221b38a 100644
>> --- a/meta/lib/oe/package_manager.py
>> +++ b/meta/lib/oe/package_manager.py
>> @@ -63,6 +63,9 @@ class RpmIndexer(Indexer):
>>                       localdata = bb.data.createCopy(self.d)
>>                       default_tune_key = "DEFAULTTUNE_virtclass-multilib-" + eext[1]
>>                       default_tune = localdata.getVar(default_tune_key, False)
>> +                    if default_tune is None:
>> +                        default_tune_key = "DEFAULTTUNE_ML_" + eext[1]
>> +                        default_tune = localdata.getVar(default_tune_key, False)
>>                       if default_tune:
>>                           localdata.setVar("DEFAULTTUNE", default_tune)
>>                           bb.data.update_data(localdata)
>> -- 
>> 1.9.1
>>
>> -- 
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core