[PATCH 1/2] meson: send user to our wiki instead of Meson bug system

[PATCH 1/2] meson: send user to our wiki instead of Meson bug system

[Ross Burton]

If a CPU family isn't recognised the first step should be to verify the mapping.
Send the user to a wiki page explaining what to do, instead of directly to the
Meson bug tracker.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-devtools/meson/meson/validate-cpu.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/meson/meson/validate-cpu.patch b/meta/recipes-devtools/meson/meson/validate-cpu.patch
index 8bdb204ab04..e7dad00d47c 100644
--- a/meta/recipes-devtools/meson/meson/validate-cpu.patch
+++ b/meta/recipes-devtools/meson/meson/validate-cpu.patch
@@ -100,7 +100,7 @@ index 091d92dc..67177c1f 100644
  
      if trial not in known_cpu_families:
 -        mlog.warning('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % trial)
-+        raise EnvironmentException('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % trial)
++        raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial)
  
      return trial
  
@@ -109,7 +109,7 @@ index 091d92dc..67177c1f 100644
  
                  if entry == 'cpu_family' and res not in known_cpu_families:
 -                    mlog.warning('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % value)
-+                    raise EnvironmentException('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % value)
++                    raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % value)
  
                  if self.ok_type(res):
                      self.config[s][entry] = res
-- 
2.11.0

[PATCH 2/2] meson: map mipsel TARGET_ARCH to mips for the cross file

[Ross Burton]

Meson uses 'mips' for both big- and little-endian MIPS machines, so map mipsel
to mips.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/classes/meson.bbclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
index 13a6f948756..0c9bf73596a 100644
--- a/meta/classes/meson.bbclass
+++ b/meta/classes/meson.bbclass
@@ -52,6 +52,8 @@ def meson_cpu_family(var, d):
     arch = d.getVar(var)
     if arch == 'powerpc':
         return 'ppc'
+    if arch == 'mipsel':
+        return 'mips'
     elif re.match(r"i[3-6]86", arch):
         return "x86"
     else:
-- 
2.11.0

Re: [PATCH 2/2] meson: map mipsel TARGET_ARCH to mips for the cross file

[Peter Kjellerstedt]

> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> Ross Burton
> Sent: den 6 juli 2018 16:51
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH 2/2] meson: map mipsel TARGET_ARCH to mips
> for the cross file
> 
> Meson uses 'mips' for both big- and little-endian MIPS machines, so map
> mipsel
> to mips.
> 
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  meta/classes/meson.bbclass | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
> index 13a6f948756..0c9bf73596a 100644
> --- a/meta/classes/meson.bbclass
> +++ b/meta/classes/meson.bbclass
> @@ -52,6 +52,8 @@ def meson_cpu_family(var, d):
>      arch = d.getVar(var)
>      if arch == 'powerpc':
>          return 'ppc'
> +    if arch == 'mipsel':

Change if to elif for consistency.

> +        return 'mips'
>      elif re.match(r"i[3-6]86", arch):
>          return "x86"
>      else:
> --
> 2.11.0

//Peter