Skip to contentSkip to conversation

gsettings-desktop-schemas: upgrade 3.28.1 -> 3.32.0

PATCH In review Andreas Müller 7 participants 13 messages May 21, 2019 – May 22, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 gsettings-desktop-schemas: upgrade 3.28.1 -> 3.32.0

* build with meson
* dependency intltool-native can go - they moved gettext only translation
* put gnome inherits together

---
 ...gir-installation-for-cross-compiling.patch | 33 +++++++++++++++++++
 ...bb => gsettings-desktop-schemas_3.32.0.bb} | 11 ++++---
 2 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas/0001-Do-not-skip-gir-installation-for-cross-compiling.patch
 rename meta/recipes-gnome/gsettings-desktop-schemas/{gsettings-desktop-schemas_3.28.1.bb => gsettings-desktop-schemas_3.32.0.bb} (43%)
meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas/0001-Do-not-skip-gir-installation-for-cross-compiling.patch new file +33 -0
new file mode 100644
index 0000000000..c481b18f1c
@@ -0,0 +1,33 @@
+From 42e58c4c3e95a4a78ee8294f9b3901726bbbabe4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
+Date: Sat, 11 May 2019 00:21:11 +0200
+Subject: [PATCH] Do not skip gir installation for cross compiling
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We are cool and can handle cross gobject-introspection.
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Andreas Müller <[email protected]>
+---
+ headers/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/headers/meson.build b/headers/meson.build
+index 3ce8b61..1132695 100644
+--- a/headers/meson.build
++++ b/headers/meson.build
+@@ -19,7 +19,7 @@ enums_xml = custom_target(
+   install: true,
+   install_dir: schemasdir)
+ 
+-if not meson.is_cross_build() and get_option('introspection')
++if get_option('introspection')
+   noinst_lib = shared_library('noinst',
+                               headers,
+                               install: false)
+-- 
+2.20.1
+
meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.32.0.bb renamed from meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.28.1.bb +7 -4
similarity index 43%
rename from meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.28.1.bb
rename to meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.32.0.bb
index 693c109d83..859f70466b 100644
@@ -5,9 +5,12 @@ BUGTRACKER = "https://bugzilla.gnome.org/"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
-DEPENDS = "glib-2.0 intltool-native"
+DEPENDS = "glib-2.0"
 
-inherit gnomebase gsettings gettext gobject-introspection upstream-version-is-even
+GNOMEBASEBUILDCLASS = "meson"
 
-SRC_URI[archive.md5sum] = "83bb19d025f126fae495ab43a2f26f40"
-SRC_URI[archive.sha256sum] = "f88ea6849ffe897c51cfeca5e45c3890010c82c58be2aee18b01349648e5502f"
+inherit gnomebase gsettings gobject-introspection gettext upstream-version-is-even
+
+SRC_URI[archive.md5sum] = "0c2d468a482c12594757442c983aa8ea"
+SRC_URI[archive.sha256sum] = "2d59b4b3a548859dfae46314ee4666787a00d5c82db382e97df7aa9d0e310a35"
+SRC_URI += "file://0001-Do-not-skip-gir-installation-for-cross-compiling.patch"
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/2 python-six: put python2/3 variant together

Upcoming 60.2.3 mozjs (meta-oe) requires python(2)-six-native for its configuration. Currently python(2)-six lives in meta-python and it could be moved to mozjs's home meta-oe but that would be just further clutter.

Once applied here patch to meta-python will be send.

---
 meta/recipes-devtools/python/python-six_1.12.0.bb | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python-six_1.12.0.bb
meta/recipes-devtools/python/python-six_1.12.0.bb new file +2 -0
new file mode 100644
index 0000000000..9075745d74
@@ -0,0 +1,2 @@
+inherit pypi setuptools
+require python-six.inc
Signature · 1 line
2.20.1
#2 lore raw

Re: [PATCH 2/2] python-six: put python2/3 variant together

Quoted 20 lines · Andreas Müller

Upcoming 60.2.3 mozjs (meta-oe) requires python(2)-six-native for its configuration. Currently python(2)-six lives in meta-python and it could be
moved to mozjs's home meta-oe but that would be just further clutter.

Once applied here patch to meta-python will be send.

---
 meta/recipes-devtools/python/python-six_1.12.0.bb | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python-six_1.12.0.bb
meta/recipes-devtools/python/python-six_1.12.0.bb new file +0 -0
new file mode 100644
index 0000000000..9075745d74

meta/recipes-devtools/python/python-six_1.12.0.bb line 2

Quoted 2 lines
meta/recipes-devtools/python/python-six_1.12.0.bb new file +2 -0
@@ -0,0 +1,2 @@
+inherit pypi setuptools
+require python-six.inc

Can it not use python3? Python2 is rapidly running out of time at this point and I'd not expect new dependencies on python2 to be appearing...

Cheers,

Richard

#3 lore raw

Re: [PATCH 2/2] python-six: put python2/3 variant together

Quoted 28 lines · Richard Purdie
Quoted 20 lines · Andreas Müller

Upcoming 60.2.3 mozjs (meta-oe) requires python(2)-six-native for its configuration. Currently python(2)-six lives in meta-python and it could be
moved to mozjs's home meta-oe but that would be just further clutter.

Once applied here patch to meta-python will be send.

---
 meta/recipes-devtools/python/python-six_1.12.0.bb | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python-six_1.12.0.bb
meta/recipes-devtools/python/python-six_1.12.0.bb new file +0 -0
new file mode 100644
index 0000000000..9075745d74

meta/recipes-devtools/python/python-six_1.12.0.bb line 2

Quoted 2 lines
meta/recipes-devtools/python/python-six_1.12.0.bb new file +2 -0
@@ -0,0 +1,2 @@
+inherit pypi setuptools
+require python-six.inc

Can it not use python3? Python2 is rapidly running out of time at this point and I'd not expect new dependencies on python2 to be appearing...

Quoted 2 lines

Cheers,

No sorry mozjs uses old crap in their configurations scripts nobody else does (python which) and ask for python2 explicitly.

Andreas

#4 lore raw

Re: [PATCH 2/2] python-six: put python2/3 variant together

Quoted 35 lines · Andreas Müller
Quoted 33 lines · Richard Purdie
Quoted 24 lines · Andreas Müller

Upcoming 60.2.3 mozjs (meta-oe) requires python(2)-six-native for its
configuration. Currently python(2)-six lives in meta-python and it
could be
moved to mozjs's home meta-oe but that would be just further clutter.

Once applied here patch to meta-python will be send.

---
 meta/recipes-devtools/python/python-six_1.12.0.bb | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python-

six_1.12.0.bb

meta/recipes-devtools/python/python-six_1.12.0.bb new file +0 -0
new file mode 100644
index 0000000000..9075745d74

meta/recipes-devtools/python/python-six_1.12.0.bb line 2

Quoted 2 lines
meta/recipes-devtools/python/python-six_1.12.0.bb new file +2 -0
@@ -0,0 +1,2 @@
+inherit pypi setuptools
+require python-six.inc

Can it not use python3? Python2 is rapidly running out of time at this
point and I'd not expect new dependencies on python2 to be appearing...

Quoted 4 lines
Quoted 2 lines

Cheers,

No sorry mozjs uses old crap in their configurations scripts nobody else does (python which) and ask for python2 explicitly.

I've been giving this a bit more thought and its our intent to try and remove python2 from OE-Core entirely so adding py2 modules back seems like a backwards step.

I think this will therefore need to go to one of the other layers, painful as that might be from an include perspective.

Upstream are only going to keep py2 compatibility to the end of the year, if that so the recipes will have to fork sooner or later anyway.

Cheers,

Richard

#5 lore raw

Re: [PATCH 2/2] python-six: put python2/3 variant together

Quoted 9 lines · On Tue, May 21, 2019 at 8:38 PM <[email protected]> wrote:
Quoted 2 lines

No sorry mozjs uses old crap in their configurations scripts nobody else does (python which) and ask for python2 explicitly.

I've been giving this a bit more thought and its our intent to try and remove python2 from OE-Core entirely so adding py2 modules back seems like a backwards step.

I think this will therefore need to go to one of the other layers, painful as that might be from an include perspective.

Yeah a new burden out of thin air is born. You know what I do: Create my own layers and am happy as I am with my other layers.

Bye

Andreas

Quoted 10 lines

Upstream are only going to keep py2 compatibility to the end of the year, if that so the recipes will have to fork sooner or later anyway.

Cheers,

Richard

#6 lore raw

Re: [PATCH 2/2] python-six: put python2/3 variant together

Quoted 12 lines · Andreas Müller
Quoted 10 lines · On Tue, May 21, 2019 at 8:38 PM <[email protected]> wrote:
Quoted 3 lines

No sorry mozjs uses old crap in their configurations scripts nobody
else does (python which) and ask for python2 explicitly.

I've been giving this a bit more thought and its our intent to try and
remove python2 from OE-Core entirely so adding py2 modules back seems
like a backwards step.

Quoted 6 lines
Quoted 2 lines

I think this will therefore need to go to one of the other layers, painful as that might be from an include perspective.

Yeah a new burden out of thin air is born. You know what I do: Create my own layers and am happy as I am with my other layers.

Bye

Its not "out of thin air". It was discussed over two years ago when we started a plan of trying to remove python2 dependencies:

http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=1fc2c9315faf65ea05fecf81450dd40b9a330435

This was in line with what upstream python recommended. Upstream python has made a clear statement on this too:

https://python3statement.org/

For a release that will ship 3 months before that deadline, it seems unreasonable to add this back to oe-core, no?

Cheers,

Richard

#7 lore raw

Re: [PATCH 2/2] python-six: put python2/3 variant together

Quoted 26 lines · On Tue, May 21, 2019 at 2:44 PM <[email protected]> wrote:
Quoted 12 lines · Andreas Müller
Quoted 10 lines · On Tue, May 21, 2019 at 8:38 PM <[email protected]> wrote:
Quoted 3 lines

No sorry mozjs uses old crap in their configurations scripts nobody
else does (python which) and ask for python2 explicitly.

I've been giving this a bit more thought and its our intent to try and
remove python2 from OE-Core entirely so adding py2 modules back seems
like a backwards step.

Quoted 6 lines
Quoted 2 lines

I think this will therefore need to go to one of the other layers, painful as that might be from an include perspective.

Yeah a new burden out of thin air is born. You know what I do: Create my own layers and am happy as I am with my other layers.

Bye

Its not "out of thin air". It was discussed over two years ago when we started a plan of trying to remove python2 dependencies:

http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=1fc2c9315faf65ea05fecf81450dd40b9a330435

Quoted 8 lines

This was in line with what upstream python recommended. Upstream python has made a clear statement on this too:

https://python3statement.org/

For a release that will ship 3 months before that deadline, it seems unreasonable to add this back to oe-core, no?

the EOL is expected to be Jan 2020, lets see what happens but I think it would be good for us
to first switch default python to be python3 and then remove python2 completely IMO, I do not
see any major distro planning to drop py2 at the stroke of it going EOL as of now, situation might
change in coming months but many of them haven't even switched defaults.

Its good that project is taking lead here but we might leave many users behind.

Quoted 13 lines

Cheers,

Richard

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#8 lore raw

Re: [PATCH 2/2] python-six: put python2/3 variant together

Quoted 43 lines · Khem Raj
Quoted 34 lines · On Tue, May 21, 2019 at 2:44 PM <[email protected]> wrote:
Quoted 14 lines · Andreas Müller
Quoted 11 lines · On Tue, May 21, 2019 at 8:38 PM < [email protected]> wrote:
Quoted 3 lines

No sorry mozjs uses old crap in their configurations scripts nobody
else does (python which) and ask for python2 explicitly.

I've been giving this a bit more thought and its our intent to try
and
remove python2 from OE-Core entirely so adding py2 modules back seems
like a backwards step.

Quoted 8 lines
Quoted 3 lines

I think this will therefore need to go to one of the other layers,
painful as that might be from an include perspective.

Yeah a new burden out of thin air is born. You know what I do:
Create
my own layers and am happy as I am with my other layers.

Bye

Its not "out of thin air". It was discussed over two years ago when we
started a plan of trying to remove python2 dependencies:

http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=1fc2c9315faf65ea05fecf81450dd40b9a330435

This was in line with what upstream python recommended. Upstream python
has made a clear statement on this too:

Quoted 6 lines

https://python3statement.org/

For a release that will ship 3 months before that deadline, it seems
unreasonable to add this back to oe-core, no?

Quoted 8 lines

the EOL is expected to be Jan 2020, lets see what happens but I think it would be good for us
to first switch default python to be python3 and then remove python2 completely IMO, I do not
see any major distro planning to drop py2 at the stroke of it going EOL as of now, situation might
change in coming months but many of them haven't even switched defaults.

I don't think we need to switch our default, just be able to build say oe-core without python/python2 in HOSTTOOLS and without needing python 2.7 in OE-Core either.

Quoted 2 lines

Its good that project is taking lead here but we might leave many users behind.

I suspect python2 will end up in a layer of its down which I'm fine with, dependencies can then be clearly seen.

Cheers,

Richard

#9 lore raw

Re: [PATCH 2/2] python-six: put python2/3 variant together

Quoted 9 lines · On Wed, 22 May 2019 at 13:05, <[email protected]> wrote:

I don't think we need to switch our default, just be able to build say oe-core without python/python2 in HOSTTOOLS and without needing python 2.7 in OE-Core either.

Quoted 2 lines

Its good that project is taking lead here but we might leave many users behind.

I suspect python2 will end up in a layer of its down which I'm fine with, dependencies can then be clearly seen.

For what it's worth, Fedora is getting serious about Python 2 removal, and they have a plan for it:
https://fedoraproject.org/wiki/Changes/RetirePython2

"All packages in Fedora that need Python 2 to run will be removed from Fedora 32 regardless of their dependencies. All packages in Fedora that need Python 2 to build will be removed from Fedora 32 regardless of their dependencies. "

Alex

#10 lore raw

Re: [PATCH 2/2] python-six: put python2/3 variant together

Quoted 12 lines · Alexander Kanavin
Quoted 9 lines · On Wed, 22 May 2019 at 13:05, <[email protected]> wrote:

I don't think we need to switch our default, just be able to build say oe-core without python/python2 in HOSTTOOLS and without needing python 2.7 in OE-Core either.

Quoted 2 lines

Its good that project is taking lead here but we might leave many users behind.

I suspect python2 will end up in a layer of its down which I'm fine with, dependencies can then be clearly seen.

Quoted 9 lines

For what it's worth, Fedora is getting serious about Python 2 removal, and they have a plan for it:
https://fedoraproject.org/wiki/Changes/RetirePython2

"All packages in Fedora that need Python 2 to run will be removed from Fedora 32 regardless of their dependencies. All packages in Fedora that need Python 2 to build will be removed from Fedora 32 regardless of their dependencies. "

We have discussed moving meta-python to its own repository (not under meta-openembedded). As part of that move, I am proposing the existing python2 recipes move to a separate (deprecated) layer, as RP mentioned earlier. Then meta-python will become python3 only. We will also move recipetool/devtool to provide python3 (only) support. People that need python2 will very soon have to live with older stable branches. This should not be a surprise.

We also need to do whatever we can with upstream projects that are not feeling an urgency to move to python3. They should likewise not be surprised at the need to switch.

Quoted 7 lines

Alex
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#11 lore raw

Re: [PATCH 2/2] python-six: put python2/3 variant together

Quoted 30 lines · Tim Orling

On Wed, May 22, 2019 at 4:27 AM Alexander Kanavin <[email protected] <mailto:[email protected]>> wrote:

On Wed, 22 May 2019 at 13:05, <[email protected] <mailto:[email protected]>> wrote:

> I don't think we need to switch our default, just be able to build say
> oe-core without python/python2 in HOSTTOOLS and without needing python
> 2.7 in OE-Core either.
>
> > Its good that project is taking lead here but we might leave many > > users behind.
>
> I suspect python2 will end up in a layer of its down which I'm fine > with, dependencies can then be clearly seen.

For what it's worth, Fedora is getting serious about Python 2 removal, and they have a plan for it:
https://fedoraproject.org/wiki/Changes/RetirePython2

"All packages in Fedora that need Python 2 to run will be removed from Fedora 32 regardless of their dependencies. All packages in Fedora that need Python 2 to build will be removed from Fedora 32 regardless of their dependencies. "

Quoted 3 lines

We have discussed moving meta-python to its own repository (not under meta-openembedded). As part of that move, I am proposing the existing python2 recipes move to a separate (deprecated) layer, as RP mentioned earlier. Then meta-python will become python3 only. We will also move recipetool/devtool to provide python3 (only) support. People that need python2 will very soon have to live with older stable branches. This should not be a surprise.

We also need to do whatever we can with upstream projects that are not feeling an urgency to move to python3. They should likewise not be surprised at the need to switch.

I would agree with this as well.

Cheers,

Alejandro

Quoted 11 lines

    Alex
    -- 
    _______________________________________________
    Openembedded-core mailing list
    [email protected]
    <mailto:[email protected]>
    http://lists.openembedded.org/mailman/listinfo/openembedded-core
#12 lore raw

Re: [PATCH 2/2] python-six: put python2/3 variant together

In reply to Richard Purdie
Quoted 14 lines · Richard Purdie
Quoted 13 lines · Andreas Müller

Upcoming 60.2.3 mozjs (meta-oe) requires python(2)-six-native for its configuration. Currently python(2)-six lives in meta-python and it could be
moved to mozjs's home meta-oe but that would be just further clutter.

Once applied here patch to meta-python will be send.

---
 meta/recipes-devtools/python/python-six_1.12.0.bb | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python-six_1.12.0.bb
Quoted 12 lines

meta/recipes-devtools/python/python-six_1.12.0.bb line 2

Quoted 9 lines
meta/recipes-devtools/python/python-six_1.12.0.bb new file +2 -0
new file mode 100644
index 0000000000..9075745d74
@@ -0,0 +1,2 @@
+inherit pypi setuptools
+require python-six.inc

Can it not use python3? Python2 is rapidly running out of time at this point and I'd not expect new dependencies on python2 to be appearing...

Also, I suspect plenty of other things use python-six and expect to get it from meta-python, not meta-oe.

We need to be driving everything we can to python3.

Philip

Quoted 5 lines

Cheers,

Richard