diff options
Diffstat (limited to 'meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch')
-rw-r--r-- | meta/recipes-devtools/meson/meson/0003-Send-user-to-our-wiki-instead-of-Meson-bug-system.patch | 38 |
1 files changed, 0 insertions, 38 deletions
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 @@ | |||
1 | From 31df0a854aa40c4ce8fbf1ca02ccc9b6bff0abfd Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@intel.com> | ||
3 | Date: Fri, 6 Jul 2018 15:51:15 +0100 | ||
4 | Subject: [PATCH] Send user to our wiki instead of Meson bug system | ||
5 | |||
6 | If a CPU family isn't recognised the first step should be to verify the | ||
7 | mapping. Send the user to a wiki page explaining what to do, instead of | ||
8 | directly to the Meson bug tracker. | ||
9 | |||
10 | Upstream-Status: Inappropriate [OE specific] | ||
11 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
12 | |||
13 | --- | ||
14 | mesonbuild/environment.py | 4 ++-- | ||
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py | ||
18 | index 267acf9..19a3c1e 100644 | ||
19 | --- a/mesonbuild/environment.py | ||
20 | +++ b/mesonbuild/environment.py | ||
21 | @@ -239,7 +239,7 @@ def detect_cpu_family(compilers): | ||
22 | return 'x86_64' | ||
23 | |||
24 | if trial not in known_cpu_families: | ||
25 | - raise EnvironmentException('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % trial) | ||
26 | + raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial) | ||
27 | |||
28 | return trial | ||
29 | |||
30 | @@ -1012,7 +1012,7 @@ class CrossBuildInfo: | ||
31 | raise EnvironmentException('Malformed value in cross file variable %s.' % entry) | ||
32 | |||
33 | if entry == 'cpu_family' and res not in known_cpu_families: | ||
34 | - raise EnvironmentException('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % trial) | ||
35 | + raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % value) | ||
36 | |||
37 | if self.ok_type(res): | ||
38 | self.config[s][entry] = res | ||