diff options
author | Andreas M?ller <schnitzeltony@gmail.com> | 2020-04-16 00:30:36 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-26 18:26:49 +0100 |
commit | 6a994a19303e692970629043c39e16593e65f1b9 (patch) | |
tree | 19c66b3540a88ccf7f02638d0cc81b9a061a75c2 | |
parent | ea688fb506d413018a913ed481eeacbd68f13656 (diff) | |
download | poky-6a994a19303e692970629043c39e16593e65f1b9.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
(From OE-Core rev: e48425a7e80283cde95886e26f17cd687bb98468)
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>
(cherry picked from commit 010202076760329829fbde8dab4f535d6f755873)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/meson.bbclass | 3 |
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): | |||
68 | os = d.getVar(var) | 68 | os = d.getVar(var) |
69 | if "mingw" in os: | 69 | if "mingw" in os: |
70 | return "windows" | 70 | return "windows" |
71 | # avoid e.g 'linux-gnueabi' | ||
72 | elif "linux" in os: | ||
73 | return "linux" | ||
71 | else: | 74 | else: |
72 | return os | 75 | return os |
73 | 76 | ||