From: Andreas M?ller <schnitzeltony@gmail.com>
Date: Wed, 15 Apr 2020 22:30:36 +0000 (+0200)
Subject: meson.bbclass: avoid unexpected operating-system names
X-Git-Tag: uninative-2.9~448
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=010202076760329829fbde8dab4f535d6f755873;p=openembedded-core.git

meson.bbclass: avoid unexpected operating-system names

For example 'linux-gnueabi' is not what meson consumers expect: See canonical
table of OS names for Meson (thanks Ross). Surprisingly this did not pop up
earlier but wrong system-name can break building as described in [1]

[1] https://lists.openembedded.org/g/openembedded-core/topic/meson_host_machine_system/73023862

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
index e9628033c6..ff52d20e56 100644
--- a/meta/classes/meson.bbclass
+++ b/meta/classes/meson.bbclass
@@ -68,6 +68,9 @@ def meson_operating_system(var, d):
     os = d.getVar(var)
     if "mingw" in os:
         return "windows"
+    # avoid e.g 'linux-gnueabi'
+    elif "linux" in os:
+        return "linux"
     else:
         return os