Patchwork [3/3] eglibc-locale.inc: use nativesdk override with the PACKAGES_DYNAMIC statement

login
register
mail settings
Submitter Hongxu Jia
Date Dec. 4, 2013, 3:15 a.m.
Message ID <529E9E34.10806@windriver.com>
Download mbox | patch
Permalink /patch/62761/
State New
Headers show

Comments

Hongxu Jia - Dec. 4, 2013, 3:15 a.m.
Hi Richard,

I have updated this patch as your suggestion, and it works well.

     nativesdk.bbclass: support nativesdk to override with the 
PACKAGES_DYNAMIC statement

     While compiling nativesdk-mtools, there was failure:
     ...
     Nothing PROVIDES 'nativesdk-glibc-gconv-ibm850'. Close matches:
     ...
     This patch supports nativesdk to override with the PACKAGES_DYNAMIC 
statement

     [YOCTO #5623]
     Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>


On 12/03/2013 08:14 PM, Richard Purdie wrote:
> On Tue, 2013-12-03 at 18:27 +0800, Hongxu Jia wrote:
>> While compiling nativesdk-mtools, there was failure:
>> ...
>> Nothing PROVIDES 'nativesdk-glibc-gconv-ibm850'. Close matches:
>> ...
>>
>> Using nativesdk override with the PACKAGES_DYNAMIC statement fixed this issue.
>>
>> [YOCTO #5623]
>>
>> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
>> ---
>>   meta/recipes-core/eglibc/eglibc-locale.inc | 6 ++++++
>>   1 file changed, 6 insertions(+)
> No.
>
> lib/oe/classextend.py has a map_regexp_variable() function which is
> called from classes/multilib.bbclass:
>
> clsextend.map_regexp_variable("PACKAGES_DYNAMIC")
>
> Perhaps such a line should be added to nativesdk.bbclass to fix this
> properly instead?
>
> Cheers,
>
> Richard
>
>> diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc
>> index 83569da..5e256a5 100644
>> --- a/meta/recipes-core/eglibc/eglibc-locale.inc
>> +++ b/meta/recipes-core/eglibc/eglibc-locale.inc
>> @@ -35,6 +35,12 @@ PACKAGES_DYNAMIC = "^locale-base-.* \
>>                       ^eglibc-gconv-.* ^eglibc-charmap-.* ^eglibc-localedata-.* ^eglibc-binary-localedata-.* \
>>                       ^glibc-gconv-.*  ^glibc-charmap-.*  ^glibc-localedata-.*  ^glibc-binary-localedata-.*"
>>   
>> +PACKAGES_DYNAMIC_class-nativesdk = "^nativesdk-locale-base-.* \
>> +                    ^nativesdk-eglibc-gconv-.* ^nativesdk-eglibc-charmap-.* \
>> +                    ^nativesdk-eglibc-localedata-.* ^nativesdk-eglibc-binary-localedata-.* \
>> +                    ^nativesdk-glibc-gconv-.*  ^nativesdk-glibc-charmap-.*  \
>> +                    ^nativesdk-glibc-localedata-.*  ^nativesdk-glibc-binary-localedata-.*"
>> +
>>   # Create a eglibc-binaries package
>>   ALLOW_EMPTY_${BPN}-binaries = "1"
>>   PACKAGES += "${BPN}-binaries"
>
Saul Wold - Dec. 10, 2013, 4:39 a.m.
On 12/03/2013 07:15 PM, Hongxu Jia wrote:
> Hi Richard,
>
> I have updated this patch as your suggestion, and it works well.
>
>      nativesdk.bbclass: support nativesdk to override with the
> PACKAGES_DYNAMIC statement
>
>      While compiling nativesdk-mtools, there was failure:
>      ...
>      Nothing PROVIDES 'nativesdk-glibc-gconv-ibm850'. Close matches:
>      ...
>      This patch supports nativesdk to override with the PACKAGES_DYNAMIC
> statement
>
>      [YOCTO #5623]
>      Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
>

In the future, please resend changes like this as a V2, we pulled the 
mtools change only to find that we did not have the correct nativesdk 
patch since it was not posted.

We have since found this patch in your branch and pulled it to master.

Thanks
	Sau!

> diff --git a/meta/classes/nativesdk.bbclass
> b/meta/classes/nativesdk.bbclass
> index 94bc326..21a69c7 100644
> --- a/meta/classes/nativesdk.bbclass
> +++ b/meta/classes/nativesdk.bbclass
> @@ -81,6 +81,7 @@ python () {
>       clsextend.map_depends_variable("DEPENDS")
>       clsextend.map_packagevars()
>       clsextend.map_variable("PROVIDES")
> +    clsextend.map_regexp_variable("PACKAGES_DYNAMIC")
>   }
>
> //Hongxu
>
> On 12/03/2013 08:14 PM, Richard Purdie wrote:
>> On Tue, 2013-12-03 at 18:27 +0800, Hongxu Jia wrote:
>>> While compiling nativesdk-mtools, there was failure:
>>> ...
>>> Nothing PROVIDES 'nativesdk-glibc-gconv-ibm850'. Close matches:
>>> ...
>>>
>>> Using nativesdk override with the PACKAGES_DYNAMIC statement fixed
>>> this issue.
>>>
>>> [YOCTO #5623]
>>>
>>> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
>>> ---
>>>   meta/recipes-core/eglibc/eglibc-locale.inc | 6 ++++++
>>>   1 file changed, 6 insertions(+)
>> No.
>>
>> lib/oe/classextend.py has a map_regexp_variable() function which is
>> called from classes/multilib.bbclass:
>>
>> clsextend.map_regexp_variable("PACKAGES_DYNAMIC")
>>
>> Perhaps such a line should be added to nativesdk.bbclass to fix this
>> properly instead?
>>
>> Cheers,
>>
>> Richard
>>
>>> diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc
>>> b/meta/recipes-core/eglibc/eglibc-locale.inc
>>> index 83569da..5e256a5 100644
>>> --- a/meta/recipes-core/eglibc/eglibc-locale.inc
>>> +++ b/meta/recipes-core/eglibc/eglibc-locale.inc
>>> @@ -35,6 +35,12 @@ PACKAGES_DYNAMIC = "^locale-base-.* \
>>>                       ^eglibc-gconv-.* ^eglibc-charmap-.*
>>> ^eglibc-localedata-.* ^eglibc-binary-localedata-.* \
>>>                       ^glibc-gconv-.*  ^glibc-charmap-.*
>>> ^glibc-localedata-.*  ^glibc-binary-localedata-.*"
>>> +PACKAGES_DYNAMIC_class-nativesdk = "^nativesdk-locale-base-.* \
>>> +                    ^nativesdk-eglibc-gconv-.*
>>> ^nativesdk-eglibc-charmap-.* \
>>> +                    ^nativesdk-eglibc-localedata-.*
>>> ^nativesdk-eglibc-binary-localedata-.* \
>>> +                    ^nativesdk-glibc-gconv-.*
>>> ^nativesdk-glibc-charmap-.*  \
>>> +                    ^nativesdk-glibc-localedata-.*
>>> ^nativesdk-glibc-binary-localedata-.*"
>>> +
>>>   # Create a eglibc-binaries package
>>>   ALLOW_EMPTY_${BPN}-binaries = "1"
>>>   PACKAGES += "${BPN}-binaries"
>>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

Patch

diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass
index 94bc326..21a69c7 100644
--- a/meta/classes/nativesdk.bbclass
+++ b/meta/classes/nativesdk.bbclass
@@ -81,6 +81,7 @@  python () {
      clsextend.map_depends_variable("DEPENDS")
      clsextend.map_packagevars()
      clsextend.map_variable("PROVIDES")
+    clsextend.map_regexp_variable("PACKAGES_DYNAMIC")
  }

//Hongxu