@@ -10,7 +10,6 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
file://0001-Linker-rules-move-cross_args-in-front-of-output_args.patch \
file://0003-native_bindir.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[sha256sum] = "92d8afd921751261e36151643464efd3394162f69efbe8cd53e0a66b1cf395eb"
@@ -21,7 +21,7 @@ index d29a77f..267acf9 100644
- mlog.warning('Unknown CPU family {!r}, please report this at '
- 'https://github.com/mesonbuild/meson/issues/new with the'
- 'output of `uname -a` and `cat /proc/cpuinfo`'.format(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
@@ -30,7 +30,7 @@ index d29a77f..267acf9 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' % 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
deleted file mode 100644
@@ -1,38 +0,0 @@
-From 31df0a854aa40c4ce8fbf1ca02ccc9b6bff0abfd Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@intel.com>
-Date: Fri, 6 Jul 2018 15:51:15 +0100
-Subject: [PATCH] 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 <ross.burton@intel.com>
-
----
- mesonbuild/environment.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 267acf9..19a3c1e 100644
---- a/mesonbuild/environment.py
-+++ b/mesonbuild/environment.py
-@@ -239,7 +239,7 @@ def detect_cpu_family(compilers):
- return 'x86_64'
-
- 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
-
-@@ -1012,7 +1012,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
Instead of one patch to change a warning into an exception and another to change the message, squash the patches together as neither of the are acceptable upstream. Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta/recipes-devtools/meson/meson.inc | 1 - .../0002-Make-CPU-family-warnings-fatal.patch | 4 +-- ...r-to-our-wiki-instead-of-Meson-bug-system.patch | 38 ---------------------- 3 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core