[OE-core] [PATCH] base.bbclass: Fix matching of SOC_FAMILY in COMPATIBLE_MACHINE

[Otavio Salvador]

On Sun, Apr 7, 2013 at 2:37 AM, Eric Bénard <eric at eukrea.com> wrote:
> Le Sat, 6 Apr 2013 17:58:30 -0300,
> Otavio Salvador <otavio at ossystems.com.br> a écrit :
>
>> On Sat, Apr 6, 2013 at 3:02 PM, Eric Bénard <eric at eukrea.com> wrote:
>> > Hi Otavio,
>> >
>> > Le Sat,  6 Apr 2013 14:17:48 -0300,
>> > Otavio Salvador <otavio at ossystems.com.br> a écrit :
>> >
>> >> When a SOC_FAMILY has more than one value, split by ':' as usual
>> >> OVERRIDES, this were not being properly checked in COMPATIBLE_MACHINE
>> >> matching as we need to iterate over each SoC family and check if it is
>> >> compatible or not.
>> >>
>> >> Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
>> >> ---
>> >>  meta/classes/base.bbclass | 12 +++++++-----
>> >>  1 file changed, 7 insertions(+), 5 deletions(-)
>> >>
>> >> diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
>> >> index abd6a52..6f24064 100644
>> >> --- a/meta/classes/base.bbclass
>> >> +++ b/meta/classes/base.bbclass
>> >> @@ -515,11 +515,13 @@ python () {
>> >>          need_machine = d.getVar('COMPATIBLE_MACHINE', True)
>> >>          if need_machine:
>> >>              import re
>> >> -            this_machine = d.getVar('MACHINE', True)
>> >> -            if this_machine and not re.match(need_machine, this_machine):
>> >> -                this_soc_family = d.getVar('SOC_FAMILY', True)
>> >> -                if (this_soc_family and not re.match(need_machine, this_soc_family)) or not this_soc_family:
>> >> -                    raise bb.parse.SkipPackage("incompatible with machine %s (not in COMPATIBLE_MACHINE)" % this_machine)
>> >> +            compat_machines = [d.getVar('MACHINE', True)]
>> >> +            compat_machines.extend((d.getVar('SOC_FAMILY', True) or "").split(":"))
>> >> +            for this_machine in compat_machines:
>> >> +                if re.match(need_machine, this_machine):
>> >> +                    break
>> >> +            else:
>> >> +                raise bb.parse.SkipPackage("incompatible with machine %s (not in COMPATIBLE_MACHINE)" % this_machine)
>> >>
>> > aren't you breaking this log here vs what is was supposed to
>> > print before ?
>>
>> The 'else' is used when no 'break' is done inside of for loop.
>>
> but will this_machine contain the value of the MACHINE variable ?

Yes, check:

...
+            compat_machines = [d.getVar('MACHINE', True)]
+            compat_machines.extend((d.getVar('SOC_FAMILY', True) or
"").split(":"))
...

--
Otavio Salvador                             O.S. Systems
E-mail: otavio at ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br