[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7640/8267] goarch.bbclass: Replace logic for setting GOARM

[Emmanuele Bassi <ebassi src gnome org>]

commit 602f786ecdace325e8f4858b3e07e9bd79229e64
Author: Will Newton <will newton gmail com>
Date:   Fri Sep 8 18:04:34 2017 -0300

    goarch.bbclass: Replace logic for setting GOARM
    
    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 resin io>
    Signed-off-by: Otavio Salvador <otavio ossystems com br>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/goarch.bbclass |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/meta/classes/goarch.bbclass b/meta/classes/goarch.bbclass
index 7960ac5..0f0d8b6 100644
--- a/meta/classes/goarch.bbclass
+++ b/meta/classes/goarch.bbclass
@@ -45,8 +45,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):