meson: Split validate-cpu.patch in three

PATCH Superseded Peter Kjellerstedt 2 participants 4 messages Jul 26, 2018 – Jul 27, 2018 Arm/Amlogic Meson SoC support

Share & tools

Peter Kjellerstedt

author

2018-07-26 20:03 UTC #0 lore raw

PATCH 1/2 meson: Split validate-cpu.patch in three

This makes it more suitable to work with, e.g., devtool. It also prepares for the update to 0.47.0 when the first patch will no longer be needed (as it is a backport).

Signed-off-by Peter Kjellerstedt <[email protected]>

---
 meta/recipes-devtools/meson/meson.inc              |  4 +-
 ...u.patch => 0001-Validate-cpu_family-3753.patch} | 80 ++++++++++------------
 .../0002-Make-CPU-family-warnings-fatal.patch      | 36 ++++++++++
 ...r-to-our-wiki-instead-of-Meson-bug-system.patch | 40 +++++++++++
 4 files changed, 115 insertions(+), 45 deletions(-)
 rename meta/recipes-devtools/meson/meson/{validate-cpu.patch => 0001-Validate-cpu_family-3753.patch} (55%)
 create mode 100644 meta/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch
 create mode 100644 meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch

meta/recipes-devtools/meson/meson.inc +3 -1

index b278d33b72..5484a8585b 100644
@@ -11,7 +11,9 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
            file://0003-native_bindir.patch \
            file://0004-Prettifying-some-output-with-pathlib.patch \
            file://0005-Set-the-meson-command-to-use-when-we-know-what-it-is.patch \
-           file://validate-cpu.patch \
+           file://0001-Validate-cpu_family-3753.patch \
+           file://0002-Make-CPU-family-warnings-fatal.patch \
+           file://0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch \
            "
 
 SRC_URI[md5sum] = "1698f6526574839de5dcdc45e3f7d582"

meta/recipes-devtools/meson/meson/0001-Validate-cpu_family-3753.patch renamed from meta/recipes-devtools/meson/meson/validate-cpu.patch +36 ~~-44~~

102 lines not on this page · raw message

meta/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch new file +36 -0

new file mode 100644
index 0000000000..3b377351a2
@@ -0,0 +1,36 @@
+From 9681c5bdea6a67abf014d94a392ef42eea7df0cd Mon Sep 17 00:00:00 2001
+From: Ross Burton <[email protected]>
+Date: Tue, 3 Jul 2018 13:59:09 +0100
+Subject: [PATCH 2/3] Make CPU family warnings fatal
+
+Upstream-Status: Inappropriate [OE specific]
+Signed-off-by: Ross Burton <[email protected]>
+---
+ mesonbuild/environment.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
+index 678d009..8b32892 100644
+--- a/mesonbuild/environment.py
++++ b/mesonbuild/environment.py
+@@ -228,7 +228,7 @@ def detect_cpu_family(compilers):
+     # Add fixes here as bugs are reported.
+ 
+     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)
+ 
+     return trial
+ 
+@@ -1043,7 +1043,7 @@ class CrossBuildInfo:
+                     raise EnvironmentException('Malformed value in cross file variable %s.' % entry)
+ 
+                 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' % trial)
+ 
+                 if self.ok_type(res):
+                     self.config[s][entry] = res
+-- 
+2.12.0
+

meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch new file +40 -0

new file mode 100644
index 0000000000..8f4603e767
@@ -0,0 +1,40 @@
+From 62f4702a1d5076d0c225f899fe65cd3badfdd022 Mon Sep 17 00:00:00 2001
+From: Ross Burton <[email protected]>
+Date: Fri, 6 Jul 2018 15:51:15 +0100
+Subject: [PATCH 3/3] Send user to our wiki instead of Meson bug system
+
+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.
+
+Upstream-Status: Inappropriate [OE specific]
+Signed-off-by: Ross Burton <[email protected]>
+---
+ mesonbuild/environment.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
+index 8b32892..a0580a2 100644
+--- a/mesonbuild/environment.py
++++ b/mesonbuild/environment.py
+@@ -228,7 +228,7 @@ def detect_cpu_family(compilers):
+     # Add fixes here as bugs are reported.
+ 
+     if trial not in known_cpu_families:
+-        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
+ 
+@@ -1043,7 +1043,7 @@ class CrossBuildInfo:
+                     raise EnvironmentException('Malformed value in cross file variable %s.' % entry)
+ 
+                 if entry == 'cpu_family' and res not in known_cpu_families:
+-                    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.' % value)
+ 
+                 if self.ok_type(res):
+                     self.config[s][entry] = res
+-- 
+2.12.0
+

Signature · 1 line

2.12.0

Peter Kjellerstedt

author

2018-07-26 20:03 UTC #1 lore raw

PATCH 2/2 meson: Support building allarch recipes again

This registers "allarch" as a known CPU family.

Signed-off-by Peter Kjellerstedt <[email protected]>

---

I do not know if there is an appropriate solution to pass upstream, but since the lack of a recognized CPU family is only a warning in the official version, the consequence of not having an "allarch" or similar CPU family is not as drastic there.

 meta/recipes-devtools/meson/meson.inc              |  1 +
 ...01-Support-building-allarch-recipes-again.patch | 28 ++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 meta/recipes-devtools/meson/meson/0001-Support-building-allarch-recipes-again.patch

meta/recipes-devtools/meson/meson.inc +1 -0

index 5484a8585b..ca7088c409 100644
@@ -14,6 +14,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
            file://0001-Validate-cpu_family-3753.patch \
            file://0002-Make-CPU-family-warnings-fatal.patch \
            file://0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch \
+           file://0001-Support-building-allarch-recipes-again.patch \
            "
 
 SRC_URI[md5sum] = "1698f6526574839de5dcdc45e3f7d582"

meta/recipes-devtools/meson/meson/0001-Support-building-allarch-recipes-again.patch new file +28 -0

new file mode 100644
index 0000000000..f6dd230916
@@ -0,0 +1,28 @@
+From d80d02a3ca6e21fa3d055c88c05234c2eb4db128 Mon Sep 17 00:00:00 2001
+From: Peter Kjellerstedt <[email protected]>
+Date: Thu, 26 Jul 2018 16:32:49 +0200
+Subject: [PATCH] Support building allarch recipes again
+
+This registers "allarch" as a known CPU family.
+
+Upstream-Status: Inappropriate [OE specific]
+Signed-off-by: Peter Kjellerstedt <[email protected]>
+---
+ mesonbuild/environment.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
+index a0580a2..712b1e8 100644
+--- a/mesonbuild/environment.py
++++ b/mesonbuild/environment.py
+@@ -73,6 +73,7 @@ from .compilers import (
+ build_filename = 'meson.build'
+ 
+ known_cpu_families = (
++    'allarch',
+     'aarch64',
+     'arm',
+     'e2k',
+-- 
+2.12.0
+

Signature · 1 line

2.12.0

Burton, Ross

2018-07-26 22:08 UTC #2 lore raw

In reply to Peter Kjellerstedt

Are you working on a Meson 0.47 upgrade? I'm also doing that (see poky-contrib:ross/meson) and "just" have G-I to rebase.

Ross

Quoted 238 lines · Peter Kjellerstedt

This makes it more suitable to work with, e.g., devtool. It also prepares for the update to 0.47.0 when the first patch will no longer be needed (as it is a backport).

Signed-off-by Peter Kjellerstedt <[email protected]>

---
 meta/recipes-devtools/meson/meson.inc              |  4 +-
 ...u.patch => 0001-Validate-cpu_family-3753.patch} | 80 ++++++++++------------
 .../0002-Make-CPU-family-warnings-fatal.patch      | 36 ++++++++++
 ...r-to-our-wiki-instead-of-Meson-bug-system.patch | 40 +++++++++++
 4 files changed, 115 insertions(+), 45 deletions(-)
 rename meta/recipes-devtools/meson/meson/{validate-cpu.patch => 0001-Validate-cpu_family-3753.patch} (55%)
 create mode 100644 meta/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch
 create mode 100644 meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch

meta/recipes-devtools/meson/meson.inc +3 -1

index b278d33b72..5484a8585b 100644
@@ -11,7 +11,9 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
            file://0003-native_bindir.patch \
            file://0004-Prettifying-some-output-with-pathlib.patch \
            file://0005-Set-the-meson-command-to-use-when-we-know-what-it-is.patch \
-           file://validate-cpu.patch \
+           file://0001-Validate-cpu_family-3753.patch \
+           file://0002-Make-CPU-family-warnings-fatal.patch \
+           file://0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch \
            "
 
 SRC_URI[md5sum] = "1698f6526574839de5dcdc45e3f7d582"

meta/recipes-devtools/meson/meson/0001-Validate-cpu_family-3753.patch renamed from meta/recipes-devtools/meson/meson/validate-cpu.patch +36 ~~-44~~

similarity index 55%
rename from meta/recipes-devtools/meson/meson/validate-cpu.patch
rename to meta/recipes-devtools/meson/meson/0001-Validate-cpu_family-3753.patch
index e7dad00d47..6b0d0ca588 100644
@@ -1,13 +1,7 @@
-Validate the passed CPU family (US: backport) and turn the upstream warning to
-an error (US: inappropriate).
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <[email protected]>
-
-From 456f7ea48503731d50a2b7287a0f198b73b4fe61 Mon Sep 17 00:00:00 2001
+From 12fe95b1943eb832a54ba09274fa02c60d04f6b0 Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Wed, 20 Jun 2018 13:45:44 +0100
-Subject: [PATCH 1/2] Validate cpu_family (#3753)
+Subject: [PATCH 1/3] Validate cpu_family (#3753)
 
 * environment: validate cpu_family in cross file

@@ -25,12 +19,16 @@ $ python3
 import platform; platform.machine()
 
 Partial fix for #3751
+
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <[email protected]>
 ---
  mesonbuild/environment.py | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
+ run_unittests.py          | 18 ++++++++++++++++++
+ 2 files changed, 42 insertions(+)
 
 diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 6920b8d6..091d92dc 100644
+index d02a837..678d009 100644
 --- a/mesonbuild/environment.py
 +++ b/mesonbuild/environment.py
 @@ -72,6 +72,22 @@ from .compilers import (

@@ -78,41 +76,35 @@ index 6920b8d6..091d92dc 100644
                  if self.ok_type(res):
                      self.config[s][entry] = res
                  elif isinstance(res, list):
---
-2.11.0
-
-
-From 202e0199d3ffd2637f4dbee08f8351520f7dde3b Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-Date: Tue, 3 Jul 2018 13:59:09 +0100
-Subject: [PATCH 2/2] Make CPU family warnings fatal
-
----
- mesonbuild/environment.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 091d92dc..67177c1f 100644
---- a/mesonbuild/environment.py
-+++ b/mesonbuild/environment.py
-@@ -228,7 +228,7 @@ def detect_cpu_family(compilers):
-     # Add fixes here as bugs are reported.
-
-     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, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial)
+diff --git a/run_unittests.py b/run_unittests.py
+index 3c215db..7185008 100755
+--- a/run_unittests.py
++++ b/run_unittests.py
+@@ -2065,6 +2065,24 @@ recommended as it can lead to undefined behaviour on some platforms''')
+         self.wipe()
 
-     return trial
-
-@@ -1043,7 +1043,7 @@ class CrossBuildInfo:
-                     raise EnvironmentException('Malformed value in cross file variable %s.' % entry)
 
-                 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, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % value)
-
-                 if self.ok_type(res):
-                     self.config[s][entry] = res
++    @unittest.skipIf(not os.path.isdir('docs'), 'Doc dir not found, presumably because this is a tarball release.')
++    def test_cpu_families_documented(self):
++        with open("docs/markdown/Reference-tables.md") as f:
++            md = f.read()
++        self.assertIsNotNone(md)
++
++        sections = list(re.finditer(r"^## (.+)$", md, re.MULTILINE))
++        for s1, s2 in zip(sections[::2], sections[1::2]):
++            if s1.group(1) == "CPU families":
++                # Extract the content for this section
++                content = md[s1.end():s2.start()]
++                # Find the list entries
++                arches = [m.group(1) for m in re.finditer(r"^\| (\w+) +\|", content, re.MULTILINE)]
++                # Drop the header
++                arches = set(arches[1:])
++                self.assertEqual(arches, set(mesonbuild.environment.known_cpu_families))
++
++
+ class FailureTests(BasePlatformTests):
+     '''
+     Tests that test failure conditions. Build files here should be dynamically
 --
-2.11.0
+2.12.0

meta/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch new file +36 -0

new file mode 100644
index 0000000000..3b377351a2
@@ -0,0 +1,36 @@
+From 9681c5bdea6a67abf014d94a392ef42eea7df0cd Mon Sep 17 00:00:00 2001
+From: Ross Burton <[email protected]>
+Date: Tue, 3 Jul 2018 13:59:09 +0100
+Subject: [PATCH 2/3] Make CPU family warnings fatal
+
+Upstream-Status: Inappropriate [OE specific]
+Signed-off-by: Ross Burton <[email protected]>
+---
+ mesonbuild/environment.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
+index 678d009..8b32892 100644
+--- a/mesonbuild/environment.py
++++ b/mesonbuild/environment.py
+@@ -228,7 +228,7 @@ def detect_cpu_family(compilers):
+     # Add fixes here as bugs are reported.
+
+     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)
+
+     return trial
+
+@@ -1043,7 +1043,7 @@ class CrossBuildInfo:
+                     raise EnvironmentException('Malformed value in cross file variable %s.' % entry)
+
+                 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' % trial)
+
+                 if self.ok_type(res):
+                     self.config[s][entry] = res
+--
+2.12.0
+

meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch new file +40 -1

new file mode 100644
index 0000000000..8f4603e767
@@ -0,0 +1,40 @@
+From 62f4702a1d5076d0c225f899fe65cd3badfdd022 Mon Sep 17 00:00:00 2001
+From: Ross Burton <[email protected]>
+Date: Fri, 6 Jul 2018 15:51:15 +0100
+Subject: [PATCH 3/3] Send user to our wiki instead of Meson bug system
+
+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.
+
+Upstream-Status: Inappropriate [OE specific]
+Signed-off-by: Ross Burton <[email protected]>
+---
+ mesonbuild/environment.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
+index 8b32892..a0580a2 100644
+--- a/mesonbuild/environment.py
++++ b/mesonbuild/environment.py
+@@ -228,7 +228,7 @@ def detect_cpu_family(compilers):
+     # Add fixes here as bugs are reported.
+
+     if trial not in known_cpu_families:
+-        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
+
+@@ -1043,7 +1043,7 @@ class CrossBuildInfo:
+                     raise EnvironmentException('Malformed value in cross file variable %s.' % entry)
+
+                 if entry == 'cpu_family' and res not in known_cpu_families:
+-                    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.' % value)
+
+                 if self.ok_type(res):
+                     self.config[s][entry] = res
+--
+2.12.0
+
--

2.12.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Peter Kjellerstedt

author

2018-07-27 00:28 UTC #3 lore raw

No, I am not. I just needed to fix the problem with building allarch recipes with meson, and when I ran devtool modify on it, it became all messy due to the way the validate-cpu.patch was formatted, so I thought it easiest to just clean that up first.

//Peter

Quoted 311 lines

-----Original Message-----
From: Burton, Ross <[email protected]>
Sent: den 27 juli 2018 00:08
To: Peter Kjellerstedt <[email protected]>
Cc: OE-core <[email protected]>
Subject: Re: [OE-core] [PATCH 1/2] meson: Split validate-cpu.patch in three
Are you working on a Meson 0.47 upgrade? I'm also doing that (see poky-contrib:ross/meson) and "just" have G-I to rebase.
Ross
Quoted 2 lines · Peter Kjellerstedt
This makes it more suitable to work with, e.g., devtool. It also prepares for the update to 0.47.0 when the first patch will no longer
be
Quoted 6 lines
needed (as it is a backport).
Signed-off-by Peter Kjellerstedt <[email protected]>
---
 meta/recipes-devtools/meson/meson.inc              |  4 +-
 ...u.patch => 0001-Validate-cpu_family-3753.patch} | 80 ++++++++++--
----------
Quoted 4 lines
 .../0002-Make-CPU-family-warnings-fatal.patch      | 36 ++++++++++
 ...r-to-our-wiki-instead-of-Meson-bug-system.patch | 40 +++++++++++
 4 files changed, 115 insertions(+), 45 deletions(-)
 rename meta/recipes-devtools/meson/meson/{validate-cpu.patch =>
0001-Validate-cpu_family-3753.patch} (55%)
Quoted 1 line
 create mode 100644 meta/recipes-devtools/meson/meson/0002-Make-CPU-
family-warnings-fatal.patch
Quoted 1 line
 create mode 100644 meta/recipes-devtools/meson/meson/0003-Send-user-
to-our-wiki-instead-of-Meson-bug-system.patch
meta/recipes-
Quoted 2 lines
meta/recipes- renamed from meta/recipes-devtools/meson/meson.inc +0 -0
devtools/meson/meson.inc
meta/recipes-devtools/meson/meson.inc SRC_URI =
Quoted 4 lines
index b278d33b72..5484a8585b 100644
meta/recipes-devtools/meson/meson.inc +0 -0
@@ -11,7 +11,9 @@ SRC_URI =
"https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
meta/recipes-devtools/meson/meson.inc SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
Quoted 3 lines
meta/recipes-devtools/meson/meson.inc +0 -0
            file://0003-native_bindir.patch \
            file://0004-Prettifying-some-output-with-pathlib.patch \
            file://0005-Set-the-meson-command-to-use-when-we-know-
what-it-is.patch \
meta/recipes-devtools/meson/meson.inc SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
Quoted 4 lines
meta/recipes-devtools/meson/meson.inc +3 -1
-           file://validate-cpu.patch \
+           file://0001-Validate-cpu_family-3753.patch \
+           file://0002-Make-CPU-family-warnings-fatal.patch \
+           file://0003-Send-user-to-our-wiki-instead-of-Meson-bug-
system.patch \
Review
Quoted 4 lines
meta/recipes-devtools/meson/meson.inc +0 -0
            "
 
 SRC_URI[md5sum] = "1698f6526574839de5dcdc45e3f7d582"
(quoted diff) +0 -0
b/meta/recipes-devtools/meson/meson/0001-Validate-cpu_family-3753.patch
Quoted 3 lines
similarity index 55%
rename from meta/recipes-devtools/meson/meson/validate-cpu.patch rename to meta/recipes-devtools/meson/meson/0001-Validate-cpu_family-
3753.patch
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family-
Quoted 3 lines
index e7dad00d47..6b0d0ca588 100644
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- renamed from meta/recipes-devtools/meson/meson/validate-cpu.patch +0 -0
3753.patch
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- line 1
Quoted 2 lines
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- renamed from meta/recipes-devtools/meson/meson/validate-cpu.patch +0 -1
@@ -1,13 +1,7 @@
-Validate the passed CPU family (US: backport) and turn the upstream
warning to
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- line 7
Quoted 6 lines
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- renamed from meta/recipes-devtools/meson/meson/validate-cpu.patch +0 -6
-an error (US: inappropriate).
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <[email protected]>
-
-From 456f7ea48503731d50a2b7287a0f198b73b4fe61 Mon Sep 17 00:00:00
2001
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- line 1
Quoted 1 line
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- renamed from meta/recipes-devtools/meson/meson/validate-cpu.patch +1 -0
+From 12fe95b1943eb832a54ba09274fa02c60d04f6b0 Mon Sep 17 00:00:00
2001
Quoted 27 lines
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- renamed from meta/recipes-devtools/meson/meson/validate-cpu.patch +7 -3
 From: Ross Burton <[email protected]>
 Date: Wed, 20 Jun 2018 13:45:44 +0100
-Subject: [PATCH 1/2] Validate cpu_family (#3753)
+Subject: [PATCH 1/3] Validate cpu_family (#3753)
 
 * environment: validate cpu_family in cross file
 
@@ -25,12 +19,16 @@ $ python3
 import platform; platform.machine()
 
 Partial fix for #3751
+
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <[email protected]>
 ---
  mesonbuild/environment.py | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
+ run_unittests.py          | 18 ++++++++++++++++++
+ 2 files changed, 42 insertions(+)
 
 diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 6920b8d6..091d92dc 100644
+index d02a837..678d009 100644
 --- a/mesonbuild/environment.py
 +++ b/mesonbuild/environment.py
 @@ -72,6 +72,22 @@ from .compilers import (
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- index 6920b8d6..091d92dc 100644 · line 85
Quoted 8 lines
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- renamed from meta/recipes-devtools/meson/meson/validate-cpu.patch +0 -5
@@ -78,41 +76,35 @@ index 6920b8d6..091d92dc 100644
                  if self.ok_type(res):
                      self.config[s][entry] = res
                  elif isinstance(res, list):
---
-2.11.0
-
-
-From 202e0199d3ffd2637f4dbee08f8351520f7dde3b Mon Sep 17 00:00:00
2001
Quoted 7 lines
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- renamed from meta/recipes-devtools/meson/meson/validate-cpu.patch +0 -7
-From: Ross Burton <[email protected]>
-Date: Tue, 3 Jul 2018 13:59:09 +0100
-Subject: [PATCH 2/2] Make CPU family warnings fatal
-
----
- mesonbuild/environment.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- index 6920b8d6..091d92dc 100644 · line 102
Quoted 10 lines
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- renamed from meta/recipes-devtools/meson/meson/validate-cpu.patch +0 ~~-10~~
-
-diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 091d92dc..67177c1f 100644
---- a/mesonbuild/environment.py
-+++ b/mesonbuild/environment.py
-@@ -228,7 +228,7 @@ def detect_cpu_family(compilers):
-     # Add fixes here as bugs are reported.
-
-     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)
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- index 6920b8d6..091d92dc 100644 · line 103
Quoted 1 line
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- renamed from meta/recipes-devtools/meson/meson/validate-cpu.patch +0 -1
-+        raise EnvironmentException('Unknown CPU family %s, see
https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial)
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- index 6920b8d6..091d92dc 100644 · line 83
Quoted 5 lines
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- renamed from meta/recipes-devtools/meson/meson/validate-cpu.patch +5 -0
+diff --git a/run_unittests.py b/run_unittests.py
+index 3c215db..7185008 100755
+--- a/run_unittests.py
++++ b/run_unittests.py
+@@ -2065,6 +2065,24 @@ recommended as it can lead to undefined
behaviour on some platforms''')
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- index 6920b8d6..091d92dc 100644 · line 108
Quoted 6 lines
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- renamed from meta/recipes-devtools/meson/meson/validate-cpu.patch +1 -4
+         self.wipe()
 
-     return trial
-
-@@ -1043,7 +1043,7 @@ class CrossBuildInfo:
-                     raise EnvironmentException('Malformed value in
cross file variable %s.' % entry)
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- index 6920b8d6..091d92dc 100644 · line 109
Quoted 2 lines
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- renamed from meta/recipes-devtools/meson/meson/validate-cpu.patch +0 -1
-                 if entry == 'cpu_family' and res not in
known_cpu_families:
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- index 6920b8d6..091d92dc 100644 · line 110
Quoted 1 line
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- renamed from meta/recipes-devtools/meson/meson/validate-cpu.patch +0 -1
--                    mlog.warning('Unknown CPU family %s, please
report this at https://github.com/mesonbuild/meson/issues/new' % value)
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- index 6920b8d6..091d92dc 100644 · line 111
Quoted 1 line
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- renamed from meta/recipes-devtools/meson/meson/validate-cpu.patch +0 -1
-+                    raise EnvironmentException('Unknown CPU family
%s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % value)
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- index 6920b8d6..091d92dc 100644 · line 86
Quoted 4 lines
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- renamed from meta/recipes-devtools/meson/meson/validate-cpu.patch +1 -3
-
-                 if self.ok_type(res):
-                     self.config[s][entry] = res
++    @unittest.skipIf(not os.path.isdir('docs'), 'Doc dir not found,
presumably because this is a tarball release.')
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- index 6920b8d6..091d92dc 100644 · line 92
Quoted 6 lines
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- renamed from meta/recipes-devtools/meson/meson/validate-cpu.patch +6 -0
++    def test_cpu_families_documented(self):
++        with open("docs/markdown/Reference-tables.md") as f:
++            md = f.read()
++        self.assertIsNotNone(md)
++
++        sections = list(re.finditer(r"^## (.+)$", md,
re.MULTILINE))
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- index 6920b8d6..091d92dc 100644 · line 98
Quoted 6 lines
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- renamed from meta/recipes-devtools/meson/meson/validate-cpu.patch +6 -0
++        for s1, s2 in zip(sections[::2], sections[1::2]):
++            if s1.group(1) == "CPU families":
++                # Extract the content for this section
++                content = md[s1.end():s2.start()]
++                # Find the list entries
++                arches = [m.group(1) for m in re.finditer(r"^\|
(\w+) +\|", content, re.MULTILINE)]
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- index 6920b8d6..091d92dc 100644 · line 101
Quoted 3 lines
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- renamed from meta/recipes-devtools/meson/meson/validate-cpu.patch +3 -0
++                # Drop the header
++                arches = set(arches[1:])
++                self.assertEqual(arches,
set(mesonbuild.environment.known_cpu_families))
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- index 6920b8d6..091d92dc 100644 · line 106
Quoted 5 lines
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- renamed from meta/recipes-devtools/meson/meson/validate-cpu.patch +5 -0
++
++
+ class FailureTests(BasePlatformTests):
+     '''
+     Tests that test failure conditions. Build files here should be
dynamically
Review
Quoted 5 lines
meta/recipes-devtools/meson/meson/0001-Validate-cpu_family- renamed from meta/recipes-devtools/meson/meson/validate-cpu.patch +1 -1
 --
-2.11.0
+2.12.0
 
(quoted diff) +0 -0
warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0002-Make-CPU- family-warnings-fatal.patch
meta/recipes-devtools/meson/meson/0002-Make-CPU-family-
Quoted 4 lines
new file mode 100644
index 0000000000..3b377351a2
meta/recipes-devtools/meson/meson/0002-Make-CPU-family- new file +0 -0
warnings-fatal.patch
meta/recipes-devtools/meson/meson/0002-Make-CPU-family- line 1
Quoted 2 lines
meta/recipes-devtools/meson/meson/0002-Make-CPU-family- new file +1 -0
@@ -0,0 +1,36 @@
+From 9681c5bdea6a67abf014d94a392ef42eea7df0cd Mon Sep 17 00:00:00
2001
Quoted 9 lines
meta/recipes-devtools/meson/meson/0002-Make-CPU-family- new file +9 -0
+From: Ross Burton <[email protected]>
+Date: Tue, 3 Jul 2018 13:59:09 +0100
+Subject: [PATCH 2/3] Make CPU family warnings fatal
+
+Upstream-Status: Inappropriate [OE specific]
+Signed-off-by: Ross Burton <[email protected]>
+---
+ mesonbuild/environment.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/meson/meson/0002-Make-CPU-family- line 20
Quoted 10 lines
meta/recipes-devtools/meson/meson/0002-Make-CPU-family- new file +10 -0
+
+diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
+index 678d009..8b32892 100644
+--- a/mesonbuild/environment.py
++++ b/mesonbuild/environment.py
+@@ -228,7 +228,7 @@ def detect_cpu_family(compilers):
+     # Add fixes here as bugs are reported.
+
+     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)
meta/recipes-devtools/meson/meson/0002-Make-CPU-family- line 21
Quoted 1 line
meta/recipes-devtools/meson/meson/0002-Make-CPU-family- new file +1 -0
++        raise EnvironmentException('Unknown CPU family %s, please
report this at https://github.com/mesonbuild/meson/issues/new' % trial)
meta/recipes-devtools/meson/meson/0002-Make-CPU-family- line 26
Quoted 5 lines
meta/recipes-devtools/meson/meson/0002-Make-CPU-family- new file +5 -0
+
+     return trial
+
+@@ -1043,7 +1043,7 @@ class CrossBuildInfo:
+                     raise EnvironmentException('Malformed value in
cross file variable %s.' % entry)
meta/recipes-devtools/meson/meson/0002-Make-CPU-family- line 28
Quoted 2 lines
meta/recipes-devtools/meson/meson/0002-Make-CPU-family- new file +2 -0
+
+                 if entry == 'cpu_family' and res not in
known_cpu_families:
meta/recipes-devtools/meson/meson/0002-Make-CPU-family- line 29
Quoted 1 line
meta/recipes-devtools/meson/meson/0002-Make-CPU-family- new file +1 -0
+-                    mlog.warning('Unknown CPU family %s, please
report this at https://github.com/mesonbuild/meson/issues/new' % value)
meta/recipes-devtools/meson/meson/0002-Make-CPU-family- line 30
Quoted 1 line
meta/recipes-devtools/meson/meson/0002-Make-CPU-family- new file +1 -0
++                    raise EnvironmentException('Unknown CPU family
%s, please report this at
https://github.com/mesonbuild/meson/issues/new' % trial)
Review
Quoted 7 lines
meta/recipes-devtools/meson/meson/0002-Make-CPU-family- new file +6 -0
+
+                 if self.ok_type(res):
+                     self.config[s][entry] = res
+--
+2.12.0
+
(quoted diff) +0 -0
wiki-instead-of-Meson-bug-system.patch b/meta/recipes- devtools/meson/meson/0003-Send-user-to-our-wiki-instead-of-Meson-bug- system.patch
meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki-
Quoted 4 lines
new file mode 100644
index 0000000000..8f4603e767
meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki- new file +0 -0
instead-of-Meson-bug-system.patch
meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki- line 1
Quoted 2 lines
meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki- new file +1 -0
@@ -0,0 +1,40 @@
+From 62f4702a1d5076d0c225f899fe65cd3badfdd022 Mon Sep 17 00:00:00
2001
meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki- line 4
Quoted 3 lines
meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki- new file +3 -0
+From: Ross Burton <[email protected]>
+Date: Fri, 6 Jul 2018 15:51:15 +0100
+Subject: [PATCH 3/3] Send user to our wiki instead of Meson bug
system
meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki- line 6
Quoted 2 lines
meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki- new file +2 -0
+
+If a CPU family isn't recognised the first step should be to verify
the
meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki- line 7
Quoted 1 line
meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki- new file +1 -0
+mapping. Send the user to a wiki page explaining what to do, instead
of
Quoted 7 lines
meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki- new file +7 -0
+directly to the Meson bug tracker.
+
+Upstream-Status: Inappropriate [OE specific]
+Signed-off-by: Ross Burton <[email protected]>
+---
+ mesonbuild/environment.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki- line 24
Quoted 10 lines
meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki- new file +10 -0
+
+diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
+index 8b32892..a0580a2 100644
+--- a/mesonbuild/environment.py
++++ b/mesonbuild/environment.py
+@@ -228,7 +228,7 @@ def detect_cpu_family(compilers):
+     # Add fixes here as bugs are reported.
+
+     if trial not in known_cpu_families:
+-        raise EnvironmentException('Unknown CPU family %s, please
report this at https://github.com/mesonbuild/meson/issues/new' % trial)
meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki- line 25
Quoted 1 line
meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki- new file +1 -0
++        raise EnvironmentException('Unknown CPU family %s, see
https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial)
meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki- line 30
Quoted 5 lines
meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki- new file +5 -0
+
+     return trial
+
+@@ -1043,7 +1043,7 @@ class CrossBuildInfo:
+                     raise EnvironmentException('Malformed value in
cross file variable %s.' % entry)
meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki- line 32
Quoted 2 lines
meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki- new file +2 -0
+
+                 if entry == 'cpu_family' and res not in
known_cpu_families:
meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki- line 33
Quoted 1 line
meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki- new file +1 -0
+-                    raise EnvironmentException('Unknown CPU family
%s, please report this at
https://github.com/mesonbuild/meson/issues/new' % trial)
meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki- line 34
Quoted 1 line
meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki- new file +1 -0
++                    raise EnvironmentException('Unknown CPU family
%s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % value)
Quoted 14 lines
meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki- new file +6 -1
+
+                 if self.ok_type(res):
+                     self.config[s][entry] = res
+--
+2.12.0
+
--
2.12.0
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core