[OE-core] [PATCH] base.bbclass: considering multilib when setting LICENSE_EXCLUSION

[Liu Jian]

Ping

于 2015年10月16日 13:58, Liu Jian 写道:
> Hi All,
>
> Will you going to merge this patch?
> I have ever discuss with Robert Yang and he agreed to integrated it.
>
> Thanks!
> Jian
>
>
> 于 2015年10月08日 14:47, Jian Liu 写道:
>> The PACKAGES is not mapped with MLPREFIX when setting LICENSE_EXCLUSION
>> in base.bbclass. For example,
>>    For libgcc-dev,
>>      LICENSE_EXCLUSION-libgcc-dev=1
>>     but for lib32-libgcc-dev,
>>      LICENSE_EXCLUSION-libgcc-dev=1
>> Obviously it is wrong for lib32-libgcc-dev.
>>
>> Add MLPREFIX before the package name during setting LICENSE_EXCLUSION
>>
>> Signed-off-by: Jian Liu <jian.liu at windriver.com>
>> ---
>>   meta/classes/base.bbclass | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
>> index f078001..89c8f04 100644
>> --- a/meta/classes/base.bbclass
>> +++ b/meta/classes/base.bbclass
>> @@ -512,7 +512,8 @@ python () {
>>                   if unskipped_pkgs:
>>                       for pkg in skipped_pkgs:
>>                           bb.debug(1, "SKIPPING the package " + pkg + 
>> " at do_rootfs because it's " + recipe_license)
>> -                        d.setVar('LICENSE_EXCLUSION-' + pkg, 1)
>> +                        mlprefix = d.getVar('MLPREFIX', True)
>> +                        d.setVar('LICENSE_EXCLUSION-' + mlprefix + 
>> pkg, 1)
>>                       for pkg in unskipped_pkgs:
>>                           bb.debug(1, "INCLUDING the package " + pkg)
>>                   elif all_skipped or incompatible_license(d, 
>> bad_licenses):
>

-- 
Jian Liu
Email: jian.liu at windriver.com
Office Phone: 86-10-84778539