diff options
| author | Ross Burton <ross.burton@intel.com> | 2018-07-06 15:51:15 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-06 22:55:02 +0100 |
| commit | 23899a254eca9a4d85a6e6ce0652536da2164413 (patch) | |
| tree | 49276cd2ea6b687a3407c3e71281de819fd31157 /meta/recipes-devtools/meson | |
| parent | ef98f64b71fb4a2bb6efb59d27ec2245ac9b4ddb (diff) | |
| download | poky-23899a254eca9a4d85a6e6ce0652536da2164413.tar.gz | |
meson: 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.
(From OE-Core rev: 6c1e880a2bf4799cf451ff20c7ab93c55a755751)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/meson')
| -rw-r--r-- | meta/recipes-devtools/meson/meson/validate-cpu.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/meson/meson/validate-cpu.patch b/meta/recipes-devtools/meson/meson/validate-cpu.patch index 8bdb204ab0..e7dad00d47 100644 --- a/meta/recipes-devtools/meson/meson/validate-cpu.patch +++ b/meta/recipes-devtools/meson/meson/validate-cpu.patch | |||
| @@ -100,7 +100,7 @@ index 091d92dc..67177c1f 100644 | |||
| 100 | 100 | ||
| 101 | if trial not in known_cpu_families: | 101 | if trial not in known_cpu_families: |
| 102 | - mlog.warning('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % trial) | 102 | - mlog.warning('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % trial) |
| 103 | + raise EnvironmentException('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % trial) | 103 | + raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial) |
| 104 | 104 | ||
| 105 | return trial | 105 | return trial |
| 106 | 106 | ||
| @@ -109,7 +109,7 @@ index 091d92dc..67177c1f 100644 | |||
| 109 | 109 | ||
| 110 | if entry == 'cpu_family' and res not in known_cpu_families: | 110 | if entry == 'cpu_family' and res not in known_cpu_families: |
| 111 | - mlog.warning('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % value) | 111 | - mlog.warning('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % value) |
| 112 | + raise EnvironmentException('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % value) | 112 | + raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % value) |
| 113 | 113 | ||
| 114 | if self.ok_type(res): | 114 | if self.ok_type(res): |
| 115 | self.config[s][entry] = res | 115 | self.config[s][entry] = res |