[gatesgarth][PATCH] xcb-proto: update to 1.14.1

[gatesgarth][PATCH] xcb-proto: update to 1.14.1

[Martin Jansa]

From: Richard Leitner <richard.leitner@skidata.com>

This fixes [1] the following build error for nativesdk on Fedora 33
which is caused by the removal of fractions.gcd() in favor of math.gcd()
in python 3.9 [2]:

ImportError: cannot import name 'gcd' from 'fractions' (/usr/lib64/python3.9/fractions.py)

Furthermore the SRC_URI is adapted as the old one doesn't provide the
1.14.1 archive.

[1] https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/commit/426ae35bee1fa0fdb8b5120b1dcd20cee6e34512
[2] https://bugs.python.org/issue39350

It's needed in gatesgarth and possibly dunfell as well to support
distributions with python-3.9 as we build libxcb-native, which is
failing with xcb-proto-1.14.

1.14.1 is a bug fix release:
https://lists.x.org/archives/xorg-announce/2020-October/003061.html

Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../xorg-proto/{xcb-proto_1.14.bb => xcb-proto_1.14.1.bb}     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-proto/{xcb-proto_1.14.bb => xcb-proto_1.14.1.bb} (84%)

diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_1.14.bb b/meta/recipes-graphics/xorg-proto/xcb-proto_1.14.1.bb
similarity index 84%
rename from meta/recipes-graphics/xorg-proto/xcb-proto_1.14.bb
rename to meta/recipes-graphics/xorg-proto/xcb-proto_1.14.1.bb
index 6de30098d6..52e474a2e9 100644
--- a/meta/recipes-graphics/xorg-proto/xcb-proto_1.14.bb
+++ b/meta/recipes-graphics/xorg-proto/xcb-proto_1.14.1.bb
@@ -11,8 +11,8 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \
                     file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65"
 
-SRC_URI = "http://xcb.freedesktop.org/dist/${BP}.tar.xz"
-SRC_URI[sha256sum] = "186a3ceb26f9b4a015f5a44dcc814c93033a5fc39684f36f1ecc79834416a605"
+SRC_URI = "https://xorg.freedesktop.org/archive/individual/proto/${BP}.tar.xz"
+SRC_URI[sha256sum] = "f04add9a972ac334ea11d9d7eb4fc7f8883835da3e4859c9afa971efdf57fcc3"
 
 inherit autotools pkgconfig python3native
 
-- 
2.30.1

Re: [OE-core] [gatesgarth][PATCH] xcb-proto: update to 1.14.1

[Steve Sakoman]

On Wed, Mar 10, 2021 at 2:54 AM Martin Jansa <Martin.Jansa@gmail.com> wrote:
>
> From: Richard Leitner <richard.leitner@skidata.com>
>
> This fixes [1] the following build error for nativesdk on Fedora 33
> which is caused by the removal of fractions.gcd() in favor of math.gcd()
> in python 3.9 [2]:
>
> ImportError: cannot import name 'gcd' from 'fractions' (/usr/lib64/python3.9/fractions.py)
>
> Furthermore the SRC_URI is adapted as the old one doesn't provide the
> 1.14.1 archive.
>
> [1] https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/commit/426ae35bee1fa0fdb8b5120b1dcd20cee6e34512
> [2] https://bugs.python.org/issue39350
>
> It's needed in gatesgarth and possibly dunfell as well to support
> distributions with python-3.9 as we build libxcb-native, which is
> failing with xcb-proto-1.14.
>
> 1.14.1 is a bug fix release:
> https://lists.x.org/archives/xorg-announce/2020-October/003061.html

Dunfell is still at version 1.13, so this wouldn't be a bug fix version bump.

Steve

> Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  .../xorg-proto/{xcb-proto_1.14.bb => xcb-proto_1.14.1.bb}     | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>  rename meta/recipes-graphics/xorg-proto/{xcb-proto_1.14.bb => xcb-proto_1.14.1.bb} (84%)
>
> diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_1.14.bb b/meta/recipes-graphics/xorg-proto/xcb-proto_1.14.1.bb
> similarity index 84%
> rename from meta/recipes-graphics/xorg-proto/xcb-proto_1.14.bb
> rename to meta/recipes-graphics/xorg-proto/xcb-proto_1.14.1.bb
> index 6de30098d6..52e474a2e9 100644
> --- a/meta/recipes-graphics/xorg-proto/xcb-proto_1.14.bb
> +++ b/meta/recipes-graphics/xorg-proto/xcb-proto_1.14.1.bb
> @@ -11,8 +11,8 @@ LICENSE = "MIT"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \
>                      file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65"
>
> -SRC_URI = "http://xcb.freedesktop.org/dist/${BP}.tar.xz"
> -SRC_URI[sha256sum] = "186a3ceb26f9b4a015f5a44dcc814c93033a5fc39684f36f1ecc79834416a605"
> +SRC_URI = "https://xorg.freedesktop.org/archive/individual/proto/${BP}.tar.xz"
> +SRC_URI[sha256sum] = "f04add9a972ac334ea11d9d7eb4fc7f8883835da3e4859c9afa971efdf57fcc3"
>
>  inherit autotools pkgconfig python3native
>
> --
> 2.30.1
>
>
> 
>

Re: [OE-core] [gatesgarth][PATCH] xcb-proto: update to 1.14.1

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3146 bytes --]

On Wed, Mar 10, 2021 at 04:33:02AM -1000, Steve Sakoman wrote:
> On Wed, Mar 10, 2021 at 2:54 AM Martin Jansa <Martin.Jansa@gmail.com> wrote:
> >
> > From: Richard Leitner <richard.leitner@skidata.com>
> >
> > This fixes [1] the following build error for nativesdk on Fedora 33
> > which is caused by the removal of fractions.gcd() in favor of math.gcd()
> > in python 3.9 [2]:
> >
> > ImportError: cannot import name 'gcd' from 'fractions' (/usr/lib64/python3.9/fractions.py)
> >
> > Furthermore the SRC_URI is adapted as the old one doesn't provide the
> > 1.14.1 archive.
> >
> > [1] https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/commit/426ae35bee1fa0fdb8b5120b1dcd20cee6e34512
> > [2] https://bugs.python.org/issue39350
> >
> > It's needed in gatesgarth and possibly dunfell as well to support
> > distributions with python-3.9 as we build libxcb-native, which is
> > failing with xcb-proto-1.14.
> >
> > 1.14.1 is a bug fix release:
> > https://lists.x.org/archives/xorg-announce/2020-October/003061.html
> 
> Dunfell is still at version 1.13, so this wouldn't be a bug fix version bump.

I see, well luckily 1.14 doesn't look too scary as well:
https://lists.x.org/archives/xorg-announce/2020-February/003038.html
https://git.openembedded.org/openembedded-core/commit/?h=gatesgarth&id=bf4ef2e3b376744b16c2f57725104207d23c28c6

If this is the only issue for building dunfell with host distro with
python-3.9 then I think it should be considered.

Isn't autobuilder using some new host distro with python-3.9 already?

FYI: I was seeing this with ubuntu 21.04, I'll trigger dunfell build on
it now.

> > Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > ---
> >  .../xorg-proto/{xcb-proto_1.14.bb => xcb-proto_1.14.1.bb}     | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >  rename meta/recipes-graphics/xorg-proto/{xcb-proto_1.14.bb => xcb-proto_1.14.1.bb} (84%)
> >
> > diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_1.14.bb b/meta/recipes-graphics/xorg-proto/xcb-proto_1.14.1.bb
> > similarity index 84%
> > rename from meta/recipes-graphics/xorg-proto/xcb-proto_1.14.bb
> > rename to meta/recipes-graphics/xorg-proto/xcb-proto_1.14.1.bb
> > index 6de30098d6..52e474a2e9 100644
> > --- a/meta/recipes-graphics/xorg-proto/xcb-proto_1.14.bb
> > +++ b/meta/recipes-graphics/xorg-proto/xcb-proto_1.14.1.bb
> > @@ -11,8 +11,8 @@ LICENSE = "MIT"
> >  LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \
> >                      file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65"
> >
> > -SRC_URI = "http://xcb.freedesktop.org/dist/${BP}.tar.xz"
> > -SRC_URI[sha256sum] = "186a3ceb26f9b4a015f5a44dcc814c93033a5fc39684f36f1ecc79834416a605"
> > +SRC_URI = "https://xorg.freedesktop.org/archive/individual/proto/${BP}.tar.xz"
> > +SRC_URI[sha256sum] = "f04add9a972ac334ea11d9d7eb4fc7f8883835da3e4859c9afa971efdf57fcc3"
> >
> >  inherit autotools pkgconfig python3native
> >
> > --
> > 2.30.1
> >
> >
> > 
> >

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 201 bytes --]

Re: [OE-core] [gatesgarth][PATCH] xcb-proto: update to 1.14.1

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2125 bytes --]

On Thu, Mar 11, 2021 at 10:14:28AM +0100, Martin Jansa wrote:
> On Wed, Mar 10, 2021 at 04:33:02AM -1000, Steve Sakoman wrote:
> > On Wed, Mar 10, 2021 at 2:54 AM Martin Jansa <Martin.Jansa@gmail.com> wrote:
> > >
> > > From: Richard Leitner <richard.leitner@skidata.com>
> > >
> > > This fixes [1] the following build error for nativesdk on Fedora 33
> > > which is caused by the removal of fractions.gcd() in favor of math.gcd()
> > > in python 3.9 [2]:
> > >
> > > ImportError: cannot import name 'gcd' from 'fractions' (/usr/lib64/python3.9/fractions.py)
> > >
> > > Furthermore the SRC_URI is adapted as the old one doesn't provide the
> > > 1.14.1 archive.
> > >
> > > [1] https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/commit/426ae35bee1fa0fdb8b5120b1dcd20cee6e34512
> > > [2] https://bugs.python.org/issue39350
> > >
> > > It's needed in gatesgarth and possibly dunfell as well to support
> > > distributions with python-3.9 as we build libxcb-native, which is
> > > failing with xcb-proto-1.14.
> > >
> > > 1.14.1 is a bug fix release:
> > > https://lists.x.org/archives/xorg-announce/2020-October/003061.html
> > 
> > Dunfell is still at version 1.13, so this wouldn't be a bug fix version bump.
> 
> I see, well luckily 1.14 doesn't look too scary as well:
> https://lists.x.org/archives/xorg-announce/2020-February/003038.html
> https://git.openembedded.org/openembedded-core/commit/?h=gatesgarth&id=bf4ef2e3b376744b16c2f57725104207d23c28c6
> 
> If this is the only issue for building dunfell with host distro with
> python-3.9 then I think it should be considered.
> 
> Isn't autobuilder using some new host distro with python-3.9 already?
> 
> FYI: I was seeing this with ubuntu 21.04, I'll trigger dunfell build on
> it now.

At least for LuneOS images this was the only build issue I've seen with 21.04.

Together with an warning about glibc:
WARNING: Your host glibc version (2.33) is newer than that in uninative (2.32). Disabling uninative so that sstate is not corrupted.

which I see you're going to address in new PR with uninative upgrade.

Cheers,

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 201 bytes --]

Re: [OE-core] [gatesgarth][PATCH] xcb-proto: update to 1.14.1

[Steve Sakoman]

On Thu, Mar 11, 2021 at 5:36 AM Martin Jansa <Martin.Jansa@gmail.com> wrote:
>
> On Thu, Mar 11, 2021 at 10:14:28AM +0100, Martin Jansa wrote:
> > On Wed, Mar 10, 2021 at 04:33:02AM -1000, Steve Sakoman wrote:
> > > On Wed, Mar 10, 2021 at 2:54 AM Martin Jansa <Martin.Jansa@gmail.com> wrote:
> > > >
> > > > From: Richard Leitner <richard.leitner@skidata.com>
> > > >
> > > > This fixes [1] the following build error for nativesdk on Fedora 33
> > > > which is caused by the removal of fractions.gcd() in favor of math.gcd()
> > > > in python 3.9 [2]:
> > > >
> > > > ImportError: cannot import name 'gcd' from 'fractions' (/usr/lib64/python3.9/fractions.py)
> > > >
> > > > Furthermore the SRC_URI is adapted as the old one doesn't provide the
> > > > 1.14.1 archive.
> > > >
> > > > [1] https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/commit/426ae35bee1fa0fdb8b5120b1dcd20cee6e34512
> > > > [2] https://bugs.python.org/issue39350
> > > >
> > > > It's needed in gatesgarth and possibly dunfell as well to support
> > > > distributions with python-3.9 as we build libxcb-native, which is
> > > > failing with xcb-proto-1.14.
> > > >
> > > > 1.14.1 is a bug fix release:
> > > > https://lists.x.org/archives/xorg-announce/2020-October/003061.html
> > >
> > > Dunfell is still at version 1.13, so this wouldn't be a bug fix version bump.
> >
> > I see, well luckily 1.14 doesn't look too scary as well:
> > https://lists.x.org/archives/xorg-announce/2020-February/003038.html
> > https://git.openembedded.org/openembedded-core/commit/?h=gatesgarth&id=bf4ef2e3b376744b16c2f57725104207d23c28c6
> >
> > If this is the only issue for building dunfell with host distro with
> > python-3.9 then I think it should be considered.
> > Isn't autobuilder using some new host distro with python-3.9 already?
> >
> > FYI: I was seeing this with ubuntu 21.04, I'll trigger dunfell build on
> > it now.
>
> At least for LuneOS images this was the only build issue I've seen with 21.04.

I'll add the version bump to my next set of patches for testing.

Steve

> Together with an warning about glibc:
> WARNING: Your host glibc version (2.33) is newer than that in uninative (2.32). Disabling uninative so that sstate is not corrupted.
>
> which I see you're going to address in new PR with uninative upgrade.
>
> Cheers,
>
> 
>

Re: [OE-core] [gatesgarth][PATCH] xcb-proto: update to 1.14.1

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2942 bytes --]

On Thu, Mar 11, 2021 at 07:50:45AM -1000, Steve Sakoman wrote:
> On Thu, Mar 11, 2021 at 5:36 AM Martin Jansa <Martin.Jansa@gmail.com> wrote:
> >
> > On Thu, Mar 11, 2021 at 10:14:28AM +0100, Martin Jansa wrote:
> > > On Wed, Mar 10, 2021 at 04:33:02AM -1000, Steve Sakoman wrote:
> > > > On Wed, Mar 10, 2021 at 2:54 AM Martin Jansa <Martin.Jansa@gmail.com> wrote:
> > > > >
> > > > > From: Richard Leitner <richard.leitner@skidata.com>
> > > > >
> > > > > This fixes [1] the following build error for nativesdk on Fedora 33
> > > > > which is caused by the removal of fractions.gcd() in favor of math.gcd()
> > > > > in python 3.9 [2]:
> > > > >
> > > > > ImportError: cannot import name 'gcd' from 'fractions' (/usr/lib64/python3.9/fractions.py)
> > > > >
> > > > > Furthermore the SRC_URI is adapted as the old one doesn't provide the
> > > > > 1.14.1 archive.
> > > > >
> > > > > [1] https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/commit/426ae35bee1fa0fdb8b5120b1dcd20cee6e34512
> > > > > [2] https://bugs.python.org/issue39350
> > > > >
> > > > > It's needed in gatesgarth and possibly dunfell as well to support
> > > > > distributions with python-3.9 as we build libxcb-native, which is
> > > > > failing with xcb-proto-1.14.
> > > > >
> > > > > 1.14.1 is a bug fix release:
> > > > > https://lists.x.org/archives/xorg-announce/2020-October/003061.html
> > > >
> > > > Dunfell is still at version 1.13, so this wouldn't be a bug fix version bump.
> > >
> > > I see, well luckily 1.14 doesn't look too scary as well:
> > > https://lists.x.org/archives/xorg-announce/2020-February/003038.html
> > > https://git.openembedded.org/openembedded-core/commit/?h=gatesgarth&id=bf4ef2e3b376744b16c2f57725104207d23c28c6
> > >
> > > If this is the only issue for building dunfell with host distro with
> > > python-3.9 then I think it should be considered.
> > > Isn't autobuilder using some new host distro with python-3.9 already?
> > >
> > > FYI: I was seeing this with ubuntu 21.04, I'll trigger dunfell build on
> > > it now.
> >
> > At least for LuneOS images this was the only build issue I've seen with 21.04.
> 
> I'll add the version bump to my next set of patches for testing.

Steve: I'm sorry, please forget what I said about upgrade, 1.13 version in dunfell already
has this fix for python-3.9 backported in:
https://git.openembedded.org/openembedded-core/commit/?h=0f688c1419b1e2dfddff3c985f89a3f1949fc9fb

so only 1.14 version in gatesgarth is affected.

If you already have those updates in queue, then they shouldn't harm,
but aren't so necessary thanks to this backport.

> > Together with an warning about glibc:
> > WARNING: Your host glibc version (2.33) is newer than that in uninative (2.32). Disabling uninative so that sstate is not corrupted.
> >
> > which I see you're going to address in new PR with uninative upgrade.
> >
> > Cheers,
> >
> > 
> >

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 201 bytes --]

Re: [OE-core] [gatesgarth][PATCH] xcb-proto: update to 1.14.1

[Steve Sakoman]

On Fri, Mar 12, 2021 at 3:25 AM Martin Jansa <martin.jansa@gmail.com> wrote:
>
> On Thu, Mar 11, 2021 at 07:50:45AM -1000, Steve Sakoman wrote:
> > On Thu, Mar 11, 2021 at 5:36 AM Martin Jansa <Martin.Jansa@gmail.com> wrote:
> > >
> > > On Thu, Mar 11, 2021 at 10:14:28AM +0100, Martin Jansa wrote:
> > > > On Wed, Mar 10, 2021 at 04:33:02AM -1000, Steve Sakoman wrote:
> > > > > On Wed, Mar 10, 2021 at 2:54 AM Martin Jansa <Martin.Jansa@gmail.com> wrote:
> > > > > >
> > > > > > From: Richard Leitner <richard.leitner@skidata.com>
> > > > > >
> > > > > > This fixes [1] the following build error for nativesdk on Fedora 33
> > > > > > which is caused by the removal of fractions.gcd() in favor of math.gcd()
> > > > > > in python 3.9 [2]:
> > > > > >
> > > > > > ImportError: cannot import name 'gcd' from 'fractions' (/usr/lib64/python3.9/fractions.py)
> > > > > >
> > > > > > Furthermore the SRC_URI is adapted as the old one doesn't provide the
> > > > > > 1.14.1 archive.
> > > > > >
> > > > > > [1] https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/commit/426ae35bee1fa0fdb8b5120b1dcd20cee6e34512
> > > > > > [2] https://bugs.python.org/issue39350
> > > > > >
> > > > > > It's needed in gatesgarth and possibly dunfell as well to support
> > > > > > distributions with python-3.9 as we build libxcb-native, which is
> > > > > > failing with xcb-proto-1.14.
> > > > > >
> > > > > > 1.14.1 is a bug fix release:
> > > > > > https://lists.x.org/archives/xorg-announce/2020-October/003061.html
> > > > >
> > > > > Dunfell is still at version 1.13, so this wouldn't be a bug fix version bump.
> > > >
> > > > I see, well luckily 1.14 doesn't look too scary as well:
> > > > https://lists.x.org/archives/xorg-announce/2020-February/003038.html
> > > > https://git.openembedded.org/openembedded-core/commit/?h=gatesgarth&id=bf4ef2e3b376744b16c2f57725104207d23c28c6
> > > >
> > > > If this is the only issue for building dunfell with host distro with
> > > > python-3.9 then I think it should be considered.
> > > > Isn't autobuilder using some new host distro with python-3.9 already?
> > > >
> > > > FYI: I was seeing this with ubuntu 21.04, I'll trigger dunfell build on
> > > > it now.
> > >
> > > At least for LuneOS images this was the only build issue I've seen with 21.04.
> >
> > I'll add the version bump to my next set of patches for testing.
>
> Steve: I'm sorry, please forget what I said about upgrade, 1.13 version in dunfell already
> has this fix for python-3.9 backported in:
> https://git.openembedded.org/openembedded-core/commit/?h=0f688c1419b1e2dfddff3c985f89a3f1949fc9fb

Ah, yes, I remember that now!  Good catch.

> so only 1.14 version in gatesgarth is affected.
>
> If you already have those updates in queue, then they shouldn't harm,
> but aren't so necessary thanks to this backport.

I haven't started testing with them yet, so I'll drop them.

Steve

> > > Together with an warning about glibc:
> > > WARNING: Your host glibc version (2.33) is newer than that in uninative (2.32). Disabling uninative so that sstate is not corrupted.
> > >
> > > which I see you're going to address in new PR with uninative upgrade.
> > >
> > > Cheers,
> > >
> > > 
> > >