diff options
author | Will Newton <will.newton@gmail.com> | 2017-09-08 09:52:23 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-10-24 14:55:01 +0100 |
commit | 50cc15335ebcdfa2a2fc52c11fa01695dfdb9e26 (patch) | |
tree | 94b892742a03359ea093fbe11eef35b8c0d83e4c /meta/classes | |
parent | 827eb5b232d54909377e2b18d39d34d6c1c21413 (diff) | |
download | poky-50cc15335ebcdfa2a2fc52c11fa01695dfdb9e26.tar.gz |
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: 93dd2f9f3edf0584f9e806c629611d645dd72dbf)
Signed-off-by: Will Newton <willn@resin.io>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | 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 4a5b2ec787..12df88f8c4 100644 --- a/meta/classes/goarch.bbclass +++ b/meta/classes/goarch.bbclass | |||
@@ -38,8 +38,11 @@ def go_map_arch(a, d): | |||
38 | 38 | ||
39 | def go_map_arm(a, f, d): | 39 | def go_map_arm(a, f, d): |
40 | import re | 40 | import re |
41 | if re.match('arm.*', a) and re.match('arm.*7.*', f): | 41 | if re.match('arm.*', a): |
42 | return '7' | 42 | if 'armv7' in f: |
43 | return '7' | ||
44 | elif 'armv6' in f: | ||
45 | return '6' | ||
43 | return '' | 46 | return '' |
44 | 47 | ||
45 | def go_map_os(o, d): | 48 | def go_map_os(o, d): |