[OE-core] [pyro][PATCH] goarch.bbclass: Replace logic for setting GOARM

[akuster808]

On 09/26/2017 09:36 AM, Will Newton wrote:
> Hi,
>
> Is this change ok for the stable branch?
merged into staging.
thanks,
Armin
>
> On Mon, Sep 18, 2017 at 4:43 PM, Will Newton <will.newton at gmail.com> wrote:
>> From: Will Newton <will.newton at gmail.com>
>>
>> The previous logic applied a regex to TUNE_FEATURES which could
>> set the GOARM value to 7 incorrectly, for example when dealing
>> with an arm1176 core. Simplify to check for the presence of
>> "armv7" instead. At the same time add a check for "armv6" and
>> set GOARM to 6 in that case.
>>
>> (From OE-Core rev: 07b60c15e9ef650940afdde37bf3f3b9c50a336d)
>>
>> Signed-off-by: Will Newton <willn at resin.io>
>> Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
>> Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
>> ---
>>  meta/classes/goarch.bbclass | 7 +++++--
>>  1 file changed, 5 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/classes/goarch.bbclass b/meta/classes/goarch.bbclass
>> index 4a5b2ec787..12df88f8c4 100644
>> --- a/meta/classes/goarch.bbclass
>> +++ b/meta/classes/goarch.bbclass
>> @@ -38,8 +38,11 @@ def go_map_arch(a, d):
>>
>>  def go_map_arm(a, f, d):
>>      import re
>> -    if re.match('arm.*', a) and re.match('arm.*7.*', f):
>> -        return '7'
>> +    if re.match('arm.*', a):
>> +        if 'armv7' in f:
>> +            return '7'
>> +        elif 'armv6' in f:
>> +            return '6'
>>      return ''
>>
>>  def go_map_os(o, d):
>> --
>> 2.13.5
>>