diff options
| author |   Ross Burton <ross.burton@intel.com> | 2018-09-25 14:43:44 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-25 23:15:42 +0100 |
| commit | d9e5308ebfe376814f383d61ed00b50e8bad526b (patch) | |
| tree | 234026f65b08fcf8a3e996175562b79018fd4d57 /meta/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch | |
| parent | 2adec315b44dad0f99ad55e04b4e3b6608613147 (diff) | |
| download | openembedded-core-contrib-d9e5308ebfe376814f383d61ed00b50e8bad526b.tar.gz | |
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 <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch')
| -rw-r--r-- | meta/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch index a6c1b25c46..ca56a6a8bf 100644 --- a/meta/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch +++ b/meta/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch @@ -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 |