From d9e5308ebfe376814f383d61ed00b50e8bad526b Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 25 Sep 2018 14:43:44 +0100 Subject: meson: squash the architecture warning patches together 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 Signed-off-by: Richard Purdie --- ...r-to-our-wiki-instead-of-Meson-bug-system.patch | 38 ---------------------- 1 file changed, 38 deletions(-) delete mode 100644 meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch (limited to 'meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch') diff --git a/meta/recipes-devtools/meson/meson/0003-Send-user-to-our-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 deleted file mode 100644 index 5295335730..0000000000 --- a/meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 31df0a854aa40c4ce8fbf1ca02ccc9b6bff0abfd Mon Sep 17 00:00:00 2001 -From: Ross Burton -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 - ---- - 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 -- cgit 1.2.3-korg