summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas M?ller <schnitzeltony@gmail.com>2020-04-16 00:30:36 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-17 16:31:48 +0100
commit010202076760329829fbde8dab4f535d6f755873 (patch)
treecc7b19b3505dc22dde191738dd5f323ee90f2e92
parent0424df825f1e509faf6cd44403c0736bb91b57c3 (diff)
downloadopenembedded-core-contrib-010202076760329829fbde8dab4f535d6f755873.tar.gz
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>
-rw-r--r--meta/classes/meson.bbclass3
1 files changed, 3 insertions, 0 deletions
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