Re: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0
I'm addressing that as well, thanks for notifying. Alex On Thu, 13 May 2021 at 07:44, Lee, Chee Yang wrote: > > I think these error is related to this patch or the gdk-pixbuf patch in > this series . > meson > > https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/2089/steps/14/logs/stdio > > https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/1635/steps/11/logs/stdio > gdk-pixbuf > > https://autobuilder.yoctoproject.org/typhoon/#/builders/119/builds/271/steps/12/logs/stdio > > > > > *From:* Alexander Kanavin > *Sent:* Thursday, 13 May, 2021 1:04 AM > *To:* Lee, Chee Yang > *Cc:* openembedded-core@lists.openembedded.org > *Subject:* Re: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0 > > > > Thank you, I will look into it. > > > > Alex > > > > On Wed, 12 May 2021 at 13:26, Lee, Chee Yang > wrote: > > Looks like this patch failed buildepoxy.EpoxyTest.test_epoxy test > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/62/builds/3417/steps/12/logs/stdio > > https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/3416/steps/12/logs/stdio > > > > >-Original Message- > >From: openembedded-core@lists.openembedded.org >c...@lists.openembedded.org> On Behalf Of Alexander Kanavin > >Sent: Monday, 10 May, 2021 9:01 PM > >To: openembedded-core@lists.openembedded.org > >Cc: Alexander Kanavin > >Subject: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0 > > > >Rebase patches; dropped chunks (and cross-prop-default.patch) have been > >removed upstream. > > > >Move native-only patches to all-patches, as they're a pain to rebase > >separately. > > > >Signed-off-by: Alexander Kanavin > >--- > > meta/recipes-devtools/meson/meson.inc | 10 +--- > > .../0001-Make-CPU-family-warnings-fatal.patch | 18 +++--- > ...sues-that-arise- > >when-cross-compiling.patch | 8 +-- ...-not-manipulate-the-environment- > >when.patch | 14 ++--- ...pport-building-allarch-recipes-again.patch | 10 > ++-- > > .../meson/meson/0003-native_bindir.patch | 58 +-- > > .../meson/meson/cross-prop-default.patch | 23 > > .../{meson_0.57.2.bb => meson_0.58.0.bb} | 0 > > ...on_0.57.2.bb => nativesdk-meson_0.58.0.bb} | 0 > > 9 files changed, 43 insertions(+), 98 deletions(-) delete mode 100644 > >meta/recipes-devtools/meson/meson/cross-prop-default.patch > > rename meta/recipes-devtools/meson/{meson_0.57.2.bb => > >meson_0.58.0.bb} (100%) rename meta/recipes-devtools/meson/{nativesdk- > >meson_0.57.2.bb => nativesdk-meson_0.58.0.bb} (100%) > > > >diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes- > >devtools/meson/meson.inc > >index 10e7d8a1ce..12a48fc992 100644 > >--- a/meta/recipes-devtools/meson/meson.inc > >+++ b/meta/recipes-devtools/meson/meson.inc > >@@ -12,16 +12,12 @@ SRC_URI = > >"https://github.com/mesonbuild/meson/releases/download/${PV}/meson- > >${P > >file://0003-native_bindir.patch \ > >file://0001-python-module-do-not-manipulate-the-environment- > >when.patch \ > >file://disable-rpath-handling.patch \ > >- file://cross-prop-default.patch \ > >file://0001-modules-python.py-do-not-substitute-python-s- > >install.patch \ > >file://gi-target-dep.patch \ > >+ file://0001-Make-CPU-family-warnings-fatal.patch \ > >+ file://0002-Support-building-allarch-recipes-again.patch \ > >" > >-SRC_URI[sha256sum] = > >"3a83e7b1c5de94fa991ec34d9b198d94f38ed699d3524cb0fdf3b99fd23d4cc5" > >- > >-SRC_URI_append_class-native = " \ > >-file://0001-Make-CPU-family-warnings-fatal.patch \ > >-file://0002-Support-building-allarch-recipes-again.patch \ > >-" > >+SRC_URI[sha256sum] = > >"f4820df0bc969c99019fd4af8ca5f136ee94c63d8a5ad67e7eb73bdbc9182fdd" > > > > UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases; > > UPSTREAM_CHECK_REGEX = "meson-(?P\d+(\.\d+)+)\.tar" > >diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family- > >warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make- > >CPU-family-warnings-fatal.patch > >index 300797f9ee..bcccfabd17 100644 > >--- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family- > >warnings-fatal.patch > >+++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family- > >warnings-fa > >+++ tal.patch > >@@ -1,34 +1,33 @@ &
Re: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0
I think these error is related to this patch or the gdk-pixbuf patch in this series . meson https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/2089/steps/14/logs/stdio https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/1635/steps/11/logs/stdio gdk-pixbuf https://autobuilder.yoctoproject.org/typhoon/#/builders/119/builds/271/steps/12/logs/stdio From: Alexander Kanavin Sent: Thursday, 13 May, 2021 1:04 AM To: Lee, Chee Yang Cc: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0 Thank you, I will look into it. Alex On Wed, 12 May 2021 at 13:26, Lee, Chee Yang mailto:chee.yang@intel.com>> wrote: Looks like this patch failed buildepoxy.EpoxyTest.test_epoxy test https://autobuilder.yoctoproject.org/typhoon/#/builders/62/builds/3417/steps/12/logs/stdio https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/3416/steps/12/logs/stdio >-Original Message- >From: >openembedded-core@lists.openembedded.org<mailto:openembedded-core@lists.openembedded.org> > c...@lists.openembedded.org<mailto:c...@lists.openembedded.org>> On Behalf Of >Alexander Kanavin >Sent: Monday, 10 May, 2021 9:01 PM >To: >openembedded-core@lists.openembedded.org<mailto:openembedded-core@lists.openembedded.org> >Cc: Alexander Kanavin mailto:alex.kana...@gmail.com>> >Subject: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0 > >Rebase patches; dropped chunks (and cross-prop-default.patch) have been >removed upstream. > >Move native-only patches to all-patches, as they're a pain to rebase >separately. > >Signed-off-by: Alexander Kanavin >mailto:alex.kana...@gmail.com>> >--- > meta/recipes-devtools/meson/meson.inc | 10 +--- > .../0001-Make-CPU-family-warnings-fatal.patch | 18 +++--- ...sues-that-arise- >when-cross-compiling.patch | 8 +-- ...-not-manipulate-the-environment- >when.patch | 14 ++--- ...pport-building-allarch-recipes-again.patch | 10 ++-- > .../meson/meson/0003-native_bindir.patch | 58 +-- > .../meson/meson/cross-prop-default.patch | 23 > .../{meson_0.57.2.bb<http://meson_0.57.2.bb> => > meson_0.58.0.bb<http://meson_0.58.0.bb>} | 0 > ...on_0.57.2.bb<http://on_0.57.2.bb> => > nativesdk-meson_0.58.0.bb<http://nativesdk-meson_0.58.0.bb>} | 0 > 9 files changed, 43 insertions(+), 98 deletions(-) delete mode 100644 >meta/recipes-devtools/meson/meson/cross-prop-default.patch > rename meta/recipes-devtools/meson/{meson_0.57.2.bb<http://meson_0.57.2.bb> => >meson_0.58.0.bb<http://meson_0.58.0.bb>} (100%) rename >meta/recipes-devtools/meson/{nativesdk- >meson_0.57.2.bb<http://meson_0.57.2.bb> => >nativesdk-meson_0.58.0.bb<http://nativesdk-meson_0.58.0.bb>} (100%) > >diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes- >devtools/meson/meson.inc >index 10e7d8a1ce..12a48fc992 100644 >--- a/meta/recipes-devtools/meson/meson.inc >+++ b/meta/recipes-devtools/meson/meson.inc >@@ -12,16 +12,12 @@ SRC_URI = >"https://github.com/mesonbuild/meson/releases/download/${PV}/meson-<https://github.com/mesonbuild/meson/releases/download/$%7BPV%7D/meson-> >${P >file://0003-native_bindir.patch \ >file://0001-python-module-do-not-manipulate-the-environment- >when.patch \ >file://disable-rpath-handling.patch \ >- file://cross-prop-default.patch \ >file://0001-modules-python.py-do-not-substitute-python-s- >install.patch \ >file://gi-target-dep.patch \ >+ file://0001-Make-CPU-family-warnings-fatal.patch \ >+ file://0002-Support-building-allarch-recipes-again.patch \ >" >-SRC_URI[sha256sum] = >"3a83e7b1c5de94fa991ec34d9b198d94f38ed699d3524cb0fdf3b99fd23d4cc5" >- >-SRC_URI_append_class-native = " \ >-file://0001-Make-CPU-family-warnings-fatal.patch \ >-file://0002-Support-building-allarch-recipes-again.patch \ >-" >+SRC_URI[sha256sum] = >"f4820df0bc969c99019fd4af8ca5f136ee94c63d8a5ad67e7eb73bdbc9182fdd" > > UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases; > UPSTREAM_CHECK_REGEX = "meson-(?P\d+(\.\d+)+)\.tar" >diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family- >warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make- >CPU-family-warnings-fatal.patch >index 300797f9ee..bcccfabd17 100644 >--- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family- >warnings-fatal.patch >+++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family- >warnings-fa >+++ tal.patch >@@ -1,34 +1,33 @@ >-From 198e2de24adf5845e3ba389b533cf43440ee8a
Re: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0
Thank you, I will look into it. Alex On Wed, 12 May 2021 at 13:26, Lee, Chee Yang wrote: > Looks like this patch failed buildepoxy.EpoxyTest.test_epoxy test > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/62/builds/3417/steps/12/logs/stdio > > https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/3416/steps/12/logs/stdio > > > > >-Original Message- > >From: openembedded-core@lists.openembedded.org >c...@lists.openembedded.org> On Behalf Of Alexander Kanavin > >Sent: Monday, 10 May, 2021 9:01 PM > >To: openembedded-core@lists.openembedded.org > >Cc: Alexander Kanavin > >Subject: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0 > > > >Rebase patches; dropped chunks (and cross-prop-default.patch) have been > >removed upstream. > > > >Move native-only patches to all-patches, as they're a pain to rebase > >separately. > > > >Signed-off-by: Alexander Kanavin > >--- > > meta/recipes-devtools/meson/meson.inc | 10 +--- > > .../0001-Make-CPU-family-warnings-fatal.patch | 18 +++--- > ...sues-that-arise- > >when-cross-compiling.patch | 8 +-- ...-not-manipulate-the-environment- > >when.patch | 14 ++--- ...pport-building-allarch-recipes-again.patch | 10 > ++-- > > .../meson/meson/0003-native_bindir.patch | 58 +-- > > .../meson/meson/cross-prop-default.patch | 23 > > .../{meson_0.57.2.bb => meson_0.58.0.bb} | 0 > > ...on_0.57.2.bb => nativesdk-meson_0.58.0.bb} | 0 > > 9 files changed, 43 insertions(+), 98 deletions(-) delete mode 100644 > >meta/recipes-devtools/meson/meson/cross-prop-default.patch > > rename meta/recipes-devtools/meson/{meson_0.57.2.bb => > >meson_0.58.0.bb} (100%) rename meta/recipes-devtools/meson/{nativesdk- > >meson_0.57.2.bb => nativesdk-meson_0.58.0.bb} (100%) > > > >diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes- > >devtools/meson/meson.inc > >index 10e7d8a1ce..12a48fc992 100644 > >--- a/meta/recipes-devtools/meson/meson.inc > >+++ b/meta/recipes-devtools/meson/meson.inc > >@@ -12,16 +12,12 @@ SRC_URI = > >"https://github.com/mesonbuild/meson/releases/download/${PV}/meson- > >${P > >file://0003-native_bindir.patch \ > >file://0001-python-module-do-not-manipulate-the-environment- > >when.patch \ > >file://disable-rpath-handling.patch \ > >- file://cross-prop-default.patch \ > >file://0001-modules-python.py-do-not-substitute-python-s- > >install.patch \ > >file://gi-target-dep.patch \ > >+ file://0001-Make-CPU-family-warnings-fatal.patch \ > >+ file://0002-Support-building-allarch-recipes-again.patch \ > >" > >-SRC_URI[sha256sum] = > >"3a83e7b1c5de94fa991ec34d9b198d94f38ed699d3524cb0fdf3b99fd23d4cc5" > >- > >-SRC_URI_append_class-native = " \ > >-file://0001-Make-CPU-family-warnings-fatal.patch \ > >-file://0002-Support-building-allarch-recipes-again.patch \ > >-" > >+SRC_URI[sha256sum] = > >"f4820df0bc969c99019fd4af8ca5f136ee94c63d8a5ad67e7eb73bdbc9182fdd" > > > > UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases; > > UPSTREAM_CHECK_REGEX = "meson-(?P\d+(\.\d+)+)\.tar" > >diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family- > >warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make- > >CPU-family-warnings-fatal.patch > >index 300797f9ee..bcccfabd17 100644 > >--- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family- > >warnings-fatal.patch > >+++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family- > >warnings-fa > >+++ tal.patch > >@@ -1,34 +1,33 @@ > >-From 198e2de24adf5845e3ba389b533cf43440ee8acb Mon Sep 17 00:00:00 > >2001 > >+From b64032a2eb1fb760f4ffd5b4b666e2433cf80d39 Mon Sep 17 00:00:00 > >2001 > > From: Ross Burton > > Date: Tue, 3 Jul 2018 13:59:09 +0100 > >-Subject: [PATCH] Make CPU family warnings fatal > >+Subject: [PATCH 1/2] Make CPU family warnings fatal > > > > Upstream-Status: Inappropriate [OE specific] > > Signed-off-by: Ross Burton > >- > > --- > > mesonbuild/envconfig.py | 2 +- > > mesonbuild/environment.py | 4 +--- > > 2 files changed, 2 insertions(+), 4 deletions(-) > > > > diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index > >ba35d16..2d3c34c 100644 > >+index c6a4df3..4d58c91 100644 > > --- a/mesonbuild/envconfig.py > > +++ b/mesonbuild/envconfig.py > >-@@ -262,7 +262,7 @@ class MachineInfo: > >+@@ -266,7 +266,7 @@ class MachineInfo: > > > > cpu_family = literal['cpu_family'] > > if cpu_family not in known_cpu_families: > >--mlog.warning('Unknown CPU family {}, please report this at > >https://github.com/mesonbuild/meson/issues/new'.format(cpu_family)) > >+-mlog.warning(f'Unknown CPU family {cpu_family}, please > report this > >at https://github.com/mesonbuild/meson/issues/new') > > +raise EnvironmentException('Unknown CPU family {}, see > >https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for >
Re: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0
Looks like this patch failed buildepoxy.EpoxyTest.test_epoxy test https://autobuilder.yoctoproject.org/typhoon/#/builders/62/builds/3417/steps/12/logs/stdio https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/3416/steps/12/logs/stdio >-Original Message- >From: openembedded-core@lists.openembedded.org c...@lists.openembedded.org> On Behalf Of Alexander Kanavin >Sent: Monday, 10 May, 2021 9:01 PM >To: openembedded-core@lists.openembedded.org >Cc: Alexander Kanavin >Subject: [OE-core] [PATCH 7/8] meson: update 0.57.2 -> 0.58.0 > >Rebase patches; dropped chunks (and cross-prop-default.patch) have been >removed upstream. > >Move native-only patches to all-patches, as they're a pain to rebase >separately. > >Signed-off-by: Alexander Kanavin >--- > meta/recipes-devtools/meson/meson.inc | 10 +--- > .../0001-Make-CPU-family-warnings-fatal.patch | 18 +++--- ...sues-that-arise- >when-cross-compiling.patch | 8 +-- ...-not-manipulate-the-environment- >when.patch | 14 ++--- ...pport-building-allarch-recipes-again.patch | 10 ++-- > .../meson/meson/0003-native_bindir.patch | 58 +-- > .../meson/meson/cross-prop-default.patch | 23 > .../{meson_0.57.2.bb => meson_0.58.0.bb} | 0 > ...on_0.57.2.bb => nativesdk-meson_0.58.0.bb} | 0 > 9 files changed, 43 insertions(+), 98 deletions(-) delete mode 100644 >meta/recipes-devtools/meson/meson/cross-prop-default.patch > rename meta/recipes-devtools/meson/{meson_0.57.2.bb => >meson_0.58.0.bb} (100%) rename meta/recipes-devtools/meson/{nativesdk- >meson_0.57.2.bb => nativesdk-meson_0.58.0.bb} (100%) > >diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes- >devtools/meson/meson.inc >index 10e7d8a1ce..12a48fc992 100644 >--- a/meta/recipes-devtools/meson/meson.inc >+++ b/meta/recipes-devtools/meson/meson.inc >@@ -12,16 +12,12 @@ SRC_URI = >"https://github.com/mesonbuild/meson/releases/download/${PV}/meson- >${P >file://0003-native_bindir.patch \ >file://0001-python-module-do-not-manipulate-the-environment- >when.patch \ >file://disable-rpath-handling.patch \ >- file://cross-prop-default.patch \ >file://0001-modules-python.py-do-not-substitute-python-s- >install.patch \ >file://gi-target-dep.patch \ >+ file://0001-Make-CPU-family-warnings-fatal.patch \ >+ file://0002-Support-building-allarch-recipes-again.patch \ >" >-SRC_URI[sha256sum] = >"3a83e7b1c5de94fa991ec34d9b198d94f38ed699d3524cb0fdf3b99fd23d4cc5" >- >-SRC_URI_append_class-native = " \ >-file://0001-Make-CPU-family-warnings-fatal.patch \ >-file://0002-Support-building-allarch-recipes-again.patch \ >-" >+SRC_URI[sha256sum] = >"f4820df0bc969c99019fd4af8ca5f136ee94c63d8a5ad67e7eb73bdbc9182fdd" > > UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases; > UPSTREAM_CHECK_REGEX = "meson-(?P\d+(\.\d+)+)\.tar" >diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family- >warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make- >CPU-family-warnings-fatal.patch >index 300797f9ee..bcccfabd17 100644 >--- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family- >warnings-fatal.patch >+++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family- >warnings-fa >+++ tal.patch >@@ -1,34 +1,33 @@ >-From 198e2de24adf5845e3ba389b533cf43440ee8acb Mon Sep 17 00:00:00 >2001 >+From b64032a2eb1fb760f4ffd5b4b666e2433cf80d39 Mon Sep 17 00:00:00 >2001 > From: Ross Burton > Date: Tue, 3 Jul 2018 13:59:09 +0100 >-Subject: [PATCH] Make CPU family warnings fatal >+Subject: [PATCH 1/2] Make CPU family warnings fatal > > Upstream-Status: Inappropriate [OE specific] > Signed-off-by: Ross Burton >- > --- > mesonbuild/envconfig.py | 2 +- > mesonbuild/environment.py | 4 +--- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index >ba35d16..2d3c34c 100644 >+index c6a4df3..4d58c91 100644 > --- a/mesonbuild/envconfig.py > +++ b/mesonbuild/envconfig.py >-@@ -262,7 +262,7 @@ class MachineInfo: >+@@ -266,7 +266,7 @@ class MachineInfo: > > cpu_family = literal['cpu_family'] > if cpu_family not in known_cpu_families: >--mlog.warning('Unknown CPU family {}, please report this at >https://github.com/mesonbuild/meson/issues/new'.format(cpu_family)) >+-mlog.warning(f'Unknown CPU family {cpu_family}, please report >this >at https://github.com/mesonbuild/meson/issues/new') > +raise EnvironmentException('Unknown CPU family {}, see >https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for >directions.'.format(cpu_family)) > > endian = literal['endian'] > if endian not in ('little', 'big'): > diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py - >index 756dd81..4d2c2b6 100644 >+index fc9b703..eea8345 100644 > --- a/mesonbuild/environment.py > +++ b/mesonbuild/environment.py >-@@ -434,9