[10/29] meson: upgrade 0.60.1 -> 0.60.2

Message ID 20211208215947.1979470-10-alex@linutronix.de
State Accepted, archived
Commit e020b140cc6eb93283533545c3d64e9aed0b2489
Headers show
Series [01/29] fetch: add a test for version check where compression changes | expand

Commit Message

Alexander Kanavin Dec. 8, 2021, 9:59 p.m. UTC
From: Alexander Kanavin <alex.kanavin@gmail.com>

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-devtools/meson/meson.inc                           | 2 +-
 .../recipes-devtools/meson/{meson_0.60.1.bb => meson_0.60.2.bb} | 0
 .../{nativesdk-meson_0.60.1.bb => nativesdk-meson_0.60.2.bb}    | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/meson/{meson_0.60.1.bb => meson_0.60.2.bb} (100%)
 rename meta/recipes-devtools/meson/{nativesdk-meson_0.60.1.bb => nativesdk-meson_0.60.2.bb} (100%)

Comments

Khem Raj Dec. 10, 2021, 5:01 p.m. UTC | #1
this breaks gjs also see https://github.com/mesonbuild/meson/issues/9472

On Wed, Dec 8, 2021 at 2:00 PM Alexander Kanavin <alex.kanavin@gmail.com> wrote:
>
> From: Alexander Kanavin <alex.kanavin@gmail.com>
>
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
>  meta/recipes-devtools/meson/meson.inc                           | 2 +-
>  .../recipes-devtools/meson/{meson_0.60.1.bb => meson_0.60.2.bb} | 0
>  .../{nativesdk-meson_0.60.1.bb => nativesdk-meson_0.60.2.bb}    | 0
>  3 files changed, 1 insertion(+), 1 deletion(-)
>  rename meta/recipes-devtools/meson/{meson_0.60.1.bb => meson_0.60.2.bb} (100%)
>  rename meta/recipes-devtools/meson/{nativesdk-meson_0.60.1.bb => nativesdk-meson_0.60.2.bb} (100%)
>
> diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
> index f383ad9f74..7fbb246b87 100644
> --- a/meta/recipes-devtools/meson/meson.inc
> +++ b/meta/recipes-devtools/meson/meson.inc
> @@ -15,7 +15,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
>             file://0002-Support-building-allarch-recipes-again.patch \
>             file://0001-is_debianlike-always-return-False.patch \
>             "
> -SRC_URI[sha256sum] = "5add789c953d984b500858b2851ee3d7add0460cf1a6f852f0a721af17384e13"
> +SRC_URI[sha256sum] = "64e6968565bf1b8152f4f9d6ca8154efb9e14caa9aabf7b22e71e6c5d053e921"
>
>  UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
>  UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"
> diff --git a/meta/recipes-devtools/meson/meson_0.60.1.bb b/meta/recipes-devtools/meson/meson_0.60.2.bb
> similarity index 100%
> rename from meta/recipes-devtools/meson/meson_0.60.1.bb
> rename to meta/recipes-devtools/meson/meson_0.60.2.bb
> diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.60.1.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.60.2.bb
> similarity index 100%
> rename from meta/recipes-devtools/meson/nativesdk-meson_0.60.1.bb
> rename to meta/recipes-devtools/meson/nativesdk-meson_0.60.2.bb
> --
> 2.20.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#159376): https://lists.openembedded.org/g/openembedded-core/message/159376
> Mute This Topic: https://lists.openembedded.org/mt/87599646/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Khem Raj Dec. 11, 2021, 2:42 a.m. UTC | #2
On Fri, Dec 10, 2021 at 9:01 AM Khem Raj <raj.khem@gmail.com> wrote:
>
> this breaks gjs also see https://github.com/mesonbuild/meson/issues/9472
>

I have a fix for gjs [1] but I was thinking meta-gnome is a good
testcase for meson. So when upgrading meson it will be good to add
this layer
to test and build world.


[1] https://lore.kernel.org/openembedded-devel/20211210173603.2826515-1-raj.khem@gmail.com/T/#u

> On Wed, Dec 8, 2021 at 2:00 PM Alexander Kanavin <alex.kanavin@gmail.com> wrote:
> >
> > From: Alexander Kanavin <alex.kanavin@gmail.com>
> >
> > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > ---
> >  meta/recipes-devtools/meson/meson.inc                           | 2 +-
> >  .../recipes-devtools/meson/{meson_0.60.1.bb => meson_0.60.2.bb} | 0
> >  .../{nativesdk-meson_0.60.1.bb => nativesdk-meson_0.60.2.bb}    | 0
> >  3 files changed, 1 insertion(+), 1 deletion(-)
> >  rename meta/recipes-devtools/meson/{meson_0.60.1.bb => meson_0.60.2.bb} (100%)
> >  rename meta/recipes-devtools/meson/{nativesdk-meson_0.60.1.bb => nativesdk-meson_0.60.2.bb} (100%)
> >
> > diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
> > index f383ad9f74..7fbb246b87 100644
> > --- a/meta/recipes-devtools/meson/meson.inc
> > +++ b/meta/recipes-devtools/meson/meson.inc
> > @@ -15,7 +15,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
> >             file://0002-Support-building-allarch-recipes-again.patch \
> >             file://0001-is_debianlike-always-return-False.patch \
> >             "
> > -SRC_URI[sha256sum] = "5add789c953d984b500858b2851ee3d7add0460cf1a6f852f0a721af17384e13"
> > +SRC_URI[sha256sum] = "64e6968565bf1b8152f4f9d6ca8154efb9e14caa9aabf7b22e71e6c5d053e921"
> >
> >  UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
> >  UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"
> > diff --git a/meta/recipes-devtools/meson/meson_0.60.1.bb b/meta/recipes-devtools/meson/meson_0.60.2.bb
> > similarity index 100%
> > rename from meta/recipes-devtools/meson/meson_0.60.1.bb
> > rename to meta/recipes-devtools/meson/meson_0.60.2.bb
> > diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.60.1.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.60.2.bb
> > similarity index 100%
> > rename from meta/recipes-devtools/meson/nativesdk-meson_0.60.1.bb
> > rename to meta/recipes-devtools/meson/nativesdk-meson_0.60.2.bb
> > --
> > 2.20.1
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#159376): https://lists.openembedded.org/g/openembedded-core/message/159376
> > Mute This Topic: https://lists.openembedded.org/mt/87599646/1997914
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
Alexander Kanavin Dec. 11, 2021, 8:44 a.m. UTC | #3
Perhaps meta-oe build in the AB should be adjusted?

https://git.yoctoproject.org/yocto-autobuilder-helper/tree/config.json#n907

Alex

On Sat, 11 Dec 2021 at 03:42, Khem Raj <raj.khem@gmail.com> wrote:

> On Fri, Dec 10, 2021 at 9:01 AM Khem Raj <raj.khem@gmail.com> wrote:
> >
> > this breaks gjs also see https://github.com/mesonbuild/meson/issues/9472
> >
>
> I have a fix for gjs [1] but I was thinking meta-gnome is a good
> testcase for meson. So when upgrading meson it will be good to add
> this layer
> to test and build world.
>
>
> [1]
> https://lore.kernel.org/openembedded-devel/20211210173603.2826515-1-raj.khem@gmail.com/T/#u
>
> > On Wed, Dec 8, 2021 at 2:00 PM Alexander Kanavin <alex.kanavin@gmail.com>
> wrote:
> > >
> > > From: Alexander Kanavin <alex.kanavin@gmail.com>
> > >
> > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > > ---
> > >  meta/recipes-devtools/meson/meson.inc                           | 2 +-
> > >  .../recipes-devtools/meson/{meson_0.60.1.bb => meson_0.60.2.bb} | 0
> > >  .../{nativesdk-meson_0.60.1.bb => nativesdk-meson_0.60.2.bb}    | 0
> > >  3 files changed, 1 insertion(+), 1 deletion(-)
> > >  rename meta/recipes-devtools/meson/{meson_0.60.1.bb =>
> meson_0.60.2.bb} (100%)
> > >  rename meta/recipes-devtools/meson/{nativesdk-meson_0.60.1.bb =>
> nativesdk-meson_0.60.2.bb} (100%)
> > >
> > > diff --git a/meta/recipes-devtools/meson/meson.inc
> b/meta/recipes-devtools/meson/meson.inc
> > > index f383ad9f74..7fbb246b87 100644
> > > --- a/meta/recipes-devtools/meson/meson.inc
> > > +++ b/meta/recipes-devtools/meson/meson.inc
> > > @@ -15,7 +15,7 @@ SRC_URI = "
> https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
> > >             file://0002-Support-building-allarch-recipes-again.patch \
> > >             file://0001-is_debianlike-always-return-False.patch \
> > >             "
> > > -SRC_URI[sha256sum] =
> "5add789c953d984b500858b2851ee3d7add0460cf1a6f852f0a721af17384e13"
> > > +SRC_URI[sha256sum] =
> "64e6968565bf1b8152f4f9d6ca8154efb9e14caa9aabf7b22e71e6c5d053e921"
> > >
> > >  UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
> > >  UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"
> > > diff --git a/meta/recipes-devtools/meson/meson_0.60.1.bb
> b/meta/recipes-devtools/meson/meson_0.60.2.bb
> > > similarity index 100%
> > > rename from meta/recipes-devtools/meson/meson_0.60.1.bb
> > > rename to meta/recipes-devtools/meson/meson_0.60.2.bb
> > > diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.60.1.bb
> b/meta/recipes-devtools/meson/nativesdk-meson_0.60.2.bb
> > > similarity index 100%
> > > rename from meta/recipes-devtools/meson/nativesdk-meson_0.60.1.bb
> > > rename to meta/recipes-devtools/meson/nativesdk-meson_0.60.2.bb
> > > --
> > > 2.20.1
> > >
> > >
> > > -=-=-=-=-=-=-=-=-=-=-=-
> > > Links: You receive all messages sent to this group.
> > > View/Reply Online (#159376):
> https://lists.openembedded.org/g/openembedded-core/message/159376
> > > Mute This Topic: https://lists.openembedded.org/mt/87599646/1997914
> > > Group Owner: openembedded-core+owner@lists.openembedded.org
> > > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
> [raj.khem@gmail.com]
> > > -=-=-=-=-=-=-=-=-=-=-=-
> > >
>

Patch

diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index f383ad9f74..7fbb246b87 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -15,7 +15,7 @@  SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
            file://0002-Support-building-allarch-recipes-again.patch \
            file://0001-is_debianlike-always-return-False.patch \
            "
-SRC_URI[sha256sum] = "5add789c953d984b500858b2851ee3d7add0460cf1a6f852f0a721af17384e13"
+SRC_URI[sha256sum] = "64e6968565bf1b8152f4f9d6ca8154efb9e14caa9aabf7b22e71e6c5d053e921"
 
 UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
 UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"
diff --git a/meta/recipes-devtools/meson/meson_0.60.1.bb b/meta/recipes-devtools/meson/meson_0.60.2.bb
similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.60.1.bb
rename to meta/recipes-devtools/meson/meson_0.60.2.bb
diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.60.1.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.60.2.bb
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.60.1.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.60.2.bb