[PATCH 01/20] python3-pyinotify: remove as unmaintained

[PATCH 01/20] python3-pyinotify: remove as unmaintained

[Alexander Kanavin]

There hasn't been a release in years, and python 3.12 is no longer
compatible as it has removed the smtpd module.
https://github.com/seb-m/pyinotify

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../packagegroups/packagegroup-meta-python.bb |  1 -
 .../python/python3-pyinotify_0.9.6.bb         | 19 -------------------
 2 files changed, 20 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python3-pyinotify_0.9.6.bb

diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
index 3b9a0f048..af1b7ba92 100644
--- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
+++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
@@ -321,7 +321,6 @@ RDEPENDS:packagegroup-meta-python3 = "\
     python3-pyflakes \
     python3-pyhamcrest \
     python3-pyiface \
-    python3-pyinotify \
     python3-pyjks \
     python3-pyjwt \
     python3-pykickstart \
diff --git a/meta-python/recipes-devtools/python/python3-pyinotify_0.9.6.bb b/meta-python/recipes-devtools/python/python3-pyinotify_0.9.6.bb
deleted file mode 100644
index 8dd5e1580..000000000
--- a/meta-python/recipes-devtools/python/python3-pyinotify_0.9.6.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "Python pyinotify: Linux filesystem events monitoring"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ab173cade7965b411528464589a08382"
-
-RDEPENDS:${PN} += "\
-    ${PYTHON_PN}-ctypes \
-    ${PYTHON_PN}-fcntl \
-    ${PYTHON_PN}-io \
-    ${PYTHON_PN}-logging \
-    ${PYTHON_PN}-misc \
-    ${PYTHON_PN}-shell \
-    ${PYTHON_PN}-smtpd \
-    ${PYTHON_PN}-threading \
-"
-
-SRC_URI[md5sum] = "8e580fa1ff3971f94a6f81672b76c406"
-SRC_URI[sha256sum] = "9c998a5d7606ca835065cdabc013ae6c66eb9ea76a00a1e3bc6e0cfe2b4f71f4"
-
-inherit pypi setuptools3
-- 
2.39.2

[PATCH 02/20] python3-supervisor: do not rely on smtpd module

[Alexander Kanavin]

It's not mentioned anywhere in source code, and python 3.12
has removed it.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta-python/recipes-devtools/python/python3-supervisor_4.2.5.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-python/recipes-devtools/python/python3-supervisor_4.2.5.bb b/meta-python/recipes-devtools/python/python3-supervisor_4.2.5.bb
index 53f8011b0..06b08e78a 100644
--- a/meta-python/recipes-devtools/python/python3-supervisor_4.2.5.bb
+++ b/meta-python/recipes-devtools/python/python3-supervisor_4.2.5.bb
@@ -17,7 +17,6 @@ RDEPENDS:${PN} = "\
     python3-xmlrpc \
     python3-resource \
     python3-setuptools \
-    python3-smtpd \
 "
 
 SRC_URI += "file://supervisord.conf \
-- 
2.39.2

[PATCH 03/20] python3-meld3: do not rely on smtpd module

[Alexander Kanavin]

It's not mentioned anywhere in source code, and python 3.12
has removed it.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta-python/recipes-devtools/python/python3-meld3_2.0.1.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-python/recipes-devtools/python/python3-meld3_2.0.1.bb b/meta-python/recipes-devtools/python/python3-meld3_2.0.1.bb
index 1be3fa5ad..7ebf9f141 100644
--- a/meta-python/recipes-devtools/python/python3-meld3_2.0.1.bb
+++ b/meta-python/recipes-devtools/python/python3-meld3_2.0.1.bb
@@ -15,6 +15,5 @@ inherit pypi setuptools3
 
 RDEPENDS:${PN} += " \
     python3-cgitb \
-    python3-smtpd \
     python3-xml \
 "
-- 
2.39.2

[PATCH 04/20] python3-m2crypto: do not rely on smtpd module

[Alexander Kanavin]

It's not mentioned anywhere in source code, and python 3.12
has removed it.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta-python/recipes-devtools/python/python3-m2crypto_0.40.1.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-python/recipes-devtools/python/python3-m2crypto_0.40.1.bb b/meta-python/recipes-devtools/python/python3-m2crypto_0.40.1.bb
index a55ded34d..c946edb2b 100644
--- a/meta-python/recipes-devtools/python/python3-m2crypto_0.40.1.bb
+++ b/meta-python/recipes-devtools/python/python3-m2crypto_0.40.1.bb
@@ -24,7 +24,6 @@ RDEPENDS:${PN} += "\
   ${PYTHON_PN}-netclient \
   ${PYTHON_PN}-netserver \
   ${PYTHON_PN}-numbers \
-  ${PYTHON_PN}-smtpd \
   ${PYTHON_PN}-xmlrpc \
 "
 
-- 
2.39.2

[PATCH 05/20] python3-uinput: remove as unmaintained

[Alexander Kanavin]

Both homepage and downloads are gone, last release in 2016,
still relies on distutils which is no longer available in python core as of 3.12.
https://pypi.org/project/python-uinput/

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../packagegroups/packagegroup-meta-python.bb |  1 -
 ...time_t-default-on-32bit-architecture.patch | 43 -------------------
 ...-use-setuptools-instead-of-distutils.patch | 30 -------------
 .../python/python3-uinput_0.11.2.bb           | 20 ---------
 4 files changed, 94 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python3-uinput/0001-Deal-with-64bit-time_t-default-on-32bit-architecture.patch
 delete mode 100644 meta-python/recipes-devtools/python/python3-uinput/0001-setup-use-setuptools-instead-of-distutils.patch
 delete mode 100644 meta-python/recipes-devtools/python/python3-uinput_0.11.2.bb

diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
index af1b7ba92..a8b4532c3 100644
--- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
+++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
@@ -438,7 +438,6 @@ RDEPENDS:packagegroup-meta-python3 = "\
     python3-typeguard \
     python3-tzlocal \
     python3-u-msgpack-python \
-    python3-uinput \
     python3-ujson \
     python3-unidiff \
     python3-uritemplate \
diff --git a/meta-python/recipes-devtools/python/python3-uinput/0001-Deal-with-64bit-time_t-default-on-32bit-architecture.patch b/meta-python/recipes-devtools/python/python3-uinput/0001-Deal-with-64bit-time_t-default-on-32bit-architecture.patch
deleted file mode 100644
index 4095fc909..000000000
--- a/meta-python/recipes-devtools/python/python3-uinput/0001-Deal-with-64bit-time_t-default-on-32bit-architecture.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 69adf9e32f5b11e15c0cbe17f9331c77fed65bf8 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 28 May 2022 15:50:50 -0700
-Subject: [PATCH] Deal with 64bit time_t default on 32bit architectures
-
-Deal with Y2K38 concerns related to Linux input events on more recent
-kernels and libcs on 32-bit systems
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libsuinput/src/suinput.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/libsuinput/src/suinput.c b/libsuinput/src/suinput.c
-index 8d5fb71..13ff16a 100644
---- a/libsuinput/src/suinput.c
-+++ b/libsuinput/src/suinput.c
-@@ -45,11 +45,20 @@ int suinput_emit(int uinput_fd, uint16_t ev_type, uint16_t ev_code,
-         struct input_event event;
- 
-         memset(&event, 0, sizeof(event));
--        gettimeofday(&event.time, 0);
-         event.type = ev_type;
-         event.code = ev_code;
-         event.value = ev_value;
- 
-+/* attempt to deal with 64-bit time keeping on recent 32-bit systems */
-+#if (__BITS_PER_LONG != 32 || !defined(__USE_TIME_BITS64))
-+	gettimeofday(&event.time, 0);
-+#else
-+        struct timeval now;
-+        memset(&now, 0, sizeof(now));
-+        gettimeofday(&now, 0);
-+        event.input_event_sec  = now.tv_sec;
-+        event.input_event_usec = now.tv_usec;
-+#endif
-         return suinput_write_event(uinput_fd, &event);
- }
- 
--- 
-2.36.1
-
diff --git a/meta-python/recipes-devtools/python/python3-uinput/0001-setup-use-setuptools-instead-of-distutils.patch b/meta-python/recipes-devtools/python/python3-uinput/0001-setup-use-setuptools-instead-of-distutils.patch
deleted file mode 100644
index b2e1b9cd8..000000000
--- a/meta-python/recipes-devtools/python/python3-uinput/0001-setup-use-setuptools-instead-of-distutils.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7a4dde83a9584adb42c7f810d882b1fbf5767e2c Mon Sep 17 00:00:00 2001
-From: Bartosz Golaszewski <brgl@bgdev.pl>
-Date: Tue, 24 May 2022 21:43:35 +0200
-Subject: [PATCH] setup: use setuptools instead of distutils
-
-The latter is deprecated, use setuptools instead.
-
-Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
----
-Upstream-Status: Pending
-
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 3fa3343..4900b8b 100644
---- a/setup.py
-+++ b/setup.py
-@@ -3,7 +3,7 @@
- import errno
- import subprocess
- 
--from distutils.core import setup, Extension
-+from setuptools import setup, Extension
- 
- libudev_so = "libudev.so.1"
- 
--- 
-2.34.1
-
diff --git a/meta-python/recipes-devtools/python/python3-uinput_0.11.2.bb b/meta-python/recipes-devtools/python/python3-uinput_0.11.2.bb
deleted file mode 100644
index ef466539b..000000000
--- a/meta-python/recipes-devtools/python/python3-uinput_0.11.2.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-SUMMARY = "Python interface to Linux uinput kernel module."
-HOMEPAGE = "https://pypi.org/project/python-uinput/"
-LICENSE = "GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
-
-SRC_URI += "file://0001-setup-use-setuptools-instead-of-distutils.patch \
-            file://0001-Deal-with-64bit-time_t-default-on-32bit-architecture.patch \
-"
-SRC_URI[sha256sum] = "99392b676c77b5795b86b7d75274db33fe754fd1e06fb3d58b167c797dc47f0c"
-
-PYPI_PACKAGE = "python-uinput"
-
-inherit pypi setuptools3
-
-DEPENDS += "udev"
-RDEPENDS:${PN} += " \
-    python3-ctypes \
-    python3-distutils \
-"
-RRECOMMENDS:${PN} += "kernel-module-uinput"
-- 
2.39.2

[PATCH 06/20] python3-mcrypto: rely on setuptools for distutils copy

[Alexander Kanavin]

It's still used in source tree:

src/M2Crypto/__init__.py:    from distutils.version import StrictVersion as Version

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta-python/recipes-devtools/python/python3-m2crypto_0.40.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-python/recipes-devtools/python/python3-m2crypto_0.40.1.bb b/meta-python/recipes-devtools/python/python3-m2crypto_0.40.1.bb
index c946edb2b..062a63a39 100644
--- a/meta-python/recipes-devtools/python/python3-m2crypto_0.40.1.bb
+++ b/meta-python/recipes-devtools/python/python3-m2crypto_0.40.1.bb
@@ -19,7 +19,7 @@ inherit pypi siteinfo setuptools3
 DEPENDS += "openssl swig-native"
 RDEPENDS:${PN} += "\
   ${PYTHON_PN}-datetime \
-  ${PYTHON_PN}-distutils \
+  ${PYTHON_PN}-setuptools \
   ${PYTHON_PN}-logging \
   ${PYTHON_PN}-netclient \
   ${PYTHON_PN}-netserver \
-- 
2.39.2

[PATCH 07/20] python3-joblib: do not rely in distutils

[Alexander Kanavin]

Upstream has removed the dependency as of 1.3.0:
https://github.com/joblib/joblib/blob/master/CHANGES.rst

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta-python/recipes-devtools/python/python3-joblib_1.3.2.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-python/recipes-devtools/python/python3-joblib_1.3.2.bb b/meta-python/recipes-devtools/python/python3-joblib_1.3.2.bb
index fe1e68c5a..d68b40e38 100644
--- a/meta-python/recipes-devtools/python/python3-joblib_1.3.2.bb
+++ b/meta-python/recipes-devtools/python/python3-joblib_1.3.2.bb
@@ -8,7 +8,6 @@ SRC_URI[sha256sum] = "92f865e621e17784e7955080b6d042489e3b8e294949cc44c6eac304f5
 
 RDEPENDS:${PN} += " \
     python3-asyncio \
-    python3-distutils \
     python3-json \
     python3-multiprocessing \
     python3-pprint \
-- 
2.39.2

[PATCH 08/20] python3-web3: remove distutils dependency

[Alexander Kanavin]

It's not mentioned in the source tree anymore.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta-python/recipes-devtools/python/python3-web3_6.11.3.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-python/recipes-devtools/python/python3-web3_6.11.3.bb b/meta-python/recipes-devtools/python/python3-web3_6.11.3.bb
index 2c7aca9ba..31974a352 100644
--- a/meta-python/recipes-devtools/python/python3-web3_6.11.3.bb
+++ b/meta-python/recipes-devtools/python/python3-web3_6.11.3.bb
@@ -10,7 +10,6 @@ inherit pypi setuptools3
 
 RDEPENDS:${PN} += " \
     python3-aiohttp \
-    python3-distutils \
     python3-eth-account \
     python3-idna \
     python3-jsonschema \
-- 
2.39.2

[PATCH 09/20] python3-cppy: remove unused distutils dependency

[Alexander Kanavin]

It's not mentioned anywhere in source tree.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta-python/recipes-devtools/python/python3-cppy_1.2.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-python/recipes-devtools/python/python3-cppy_1.2.1.bb b/meta-python/recipes-devtools/python/python3-cppy_1.2.1.bb
index 270f74963..7817401fa 100644
--- a/meta-python/recipes-devtools/python/python3-cppy_1.2.1.bb
+++ b/meta-python/recipes-devtools/python/python3-cppy_1.2.1.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0bfb3e39b13587f0028f17baf0e42371"
 
 SRC_URI[sha256sum] = "83b43bf17b1085ac15c5debdb42154f138b928234b21447358981f69d0d6fe1b"
 
-RDEPENDS:${PN} += "python3-setuptools python3-distutils"
+RDEPENDS:${PN} += "python3-setuptools"
 
 inherit pypi python_setuptools_build_meta
 
-- 
2.39.2

[PATCH 10/20] python3-pyroute2: remove unused distutils dependency

[Alexander Kanavin]

It's not mentioned in source tree.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta-python/recipes-devtools/python/python3-pyroute2_0.7.9.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-python/recipes-devtools/python/python3-pyroute2_0.7.9.bb b/meta-python/recipes-devtools/python/python3-pyroute2_0.7.9.bb
index baf3cf8ed..9365a330e 100644
--- a/meta-python/recipes-devtools/python/python3-pyroute2_0.7.9.bb
+++ b/meta-python/recipes-devtools/python/python3-pyroute2_0.7.9.bb
@@ -10,7 +10,6 @@ inherit setuptools3 pypi ptest
 
 RDEPENDS:${PN} += " \
     python3-ctypes \
-    python3-distutils \
     python3-io \
     python3-json \
     python3-fcntl \
-- 
2.39.2

[PATCH 11/20] python3-eventlet: backport a patch to remove distutils dependency

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...o-host-0-is-not-supported-on-OpenInd.patch | 78 +++++++++++++++++++
 .../python/python3-eventlet_0.33.3.bb         |  2 +-
 2 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 meta-python/recipes-devtools/python/python3-eventlet/0001-tests-getaddrinfo-host-0-is-not-supported-on-OpenInd.patch

diff --git a/meta-python/recipes-devtools/python/python3-eventlet/0001-tests-getaddrinfo-host-0-is-not-supported-on-OpenInd.patch b/meta-python/recipes-devtools/python/python3-eventlet/0001-tests-getaddrinfo-host-0-is-not-supported-on-OpenInd.patch
new file mode 100644
index 000000000..61a37d94e
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-eventlet/0001-tests-getaddrinfo-host-0-is-not-supported-on-OpenInd.patch
@@ -0,0 +1,78 @@
+From ac2f960a50710bb257e87bed4e3c95a746f2a0fe Mon Sep 17 00:00:00 2001
+From: Sergey Shepelev <temotor@gmail.com>
+Date: Mon, 27 Mar 2023 22:07:15 +0300
+Subject: [PATCH] tests: getaddrinfo(host, 0) is not supported on OpenIndiana
+ platform
+
+https://github.com/eventlet/eventlet/issues/791
+
+Upstream-Status: Backport
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ tests/greendns_test.py | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/tests/greendns_test.py b/tests/greendns_test.py
+index feab2b6..3802f44 100644
+--- a/tests/greendns_test.py
++++ b/tests/greendns_test.py
+@@ -613,14 +613,14 @@ class TestGetaddrinfo(tests.LimitedTestCase):
+     def test_getaddrinfo_only_a_ans(self):
+         greendns.resolve = _make_mock_resolve()
+         greendns.resolve.add('example.com', '1.2.3.4')
+-        res = greendns.getaddrinfo('example.com', 0)
++        res = greendns.getaddrinfo('example.com', None)
+         addr = [('1.2.3.4', 0)] * len(res)
+         assert addr == [ai[-1] for ai in res]
+ 
+     def test_getaddrinfo_only_aaaa_ans(self):
+         greendns.resolve = _make_mock_resolve()
+         greendns.resolve.add('example.com', 'dead:beef::1')
+-        res = greendns.getaddrinfo('example.com', 0)
++        res = greendns.getaddrinfo('example.com', None)
+         addr = [('dead:beef::1', 0, 0, 0)] * len(res)
+         assert addr == [ai[-1] for ai in res]
+ 
+@@ -637,7 +637,7 @@ class TestGetaddrinfo(tests.LimitedTestCase):
+         res.raises = greendns.dns.exception.Timeout
+         greendns.resolver._resolver = res()
+ 
+-        result = greendns.getaddrinfo('example.com', 0, 0)
++        result = greendns.getaddrinfo('example.com', None, 0)
+         addr = [('1.2.3.4', 0)] * len(result)
+         assert addr == [ai[-1] for ai in result]
+ 
+@@ -654,7 +654,7 @@ class TestGetaddrinfo(tests.LimitedTestCase):
+         res.raises = greendns.dns.exception.DNSException
+         greendns.resolver._resolver = res()
+ 
+-        result = greendns.getaddrinfo('example.com', 0, 0)
++        result = greendns.getaddrinfo('example.com', None, 0)
+         addr = [('1.2.3.4', 0)] * len(result)
+         assert addr == [ai[-1] for ai in result]
+ 
+@@ -667,7 +667,7 @@ class TestGetaddrinfo(tests.LimitedTestCase):
+         greendns.resolver._resolver = res()
+ 
+         with tests.assert_raises(socket.gaierror):
+-            greendns.getaddrinfo('example.com', 0, 0)
++            greendns.getaddrinfo('example.com', None, 0)
+ 
+     def test_getaddrinfo_hosts_only_dns_error(self):
+         hostsres = _make_mock_base_resolver()
+@@ -678,13 +678,13 @@ class TestGetaddrinfo(tests.LimitedTestCase):
+         greendns.resolver._resolver = res()
+ 
+         with tests.assert_raises(socket.gaierror):
+-            greendns.getaddrinfo('example.com', 0, 0)
++            greendns.getaddrinfo('example.com', None, 0)
+ 
+     def test_canonname(self):
+         greendns.resolve = _make_mock_resolve()
+         greendns.resolve.add('host.example.com', '1.2.3.4')
+         greendns.resolve_cname = self._make_mock_resolve_cname()
+-        res = greendns.getaddrinfo('host.example.com', 0,
++        res = greendns.getaddrinfo('host.example.com', None,
+                                    0, 0, 0, socket.AI_CANONNAME)
+         assert res[0][3] == 'cname.example.com'
+ 
diff --git a/meta-python/recipes-devtools/python/python3-eventlet_0.33.3.bb b/meta-python/recipes-devtools/python/python3-eventlet_0.33.3.bb
index c1256661b..fe4d4f020 100644
--- a/meta-python/recipes-devtools/python/python3-eventlet_0.33.3.bb
+++ b/meta-python/recipes-devtools/python/python3-eventlet_0.33.3.bb
@@ -4,6 +4,7 @@ SECTION = "devel/python"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=56472ad6de4caf50e05332a34b66e778"
 
+SRC_URI += "file://0001-tests-getaddrinfo-host-0-is-not-supported-on-OpenInd.patch"
 SRC_URI[sha256sum] = "722803e7eadff295347539da363d68ae155b8b26ae6a634474d0a920be73cfda"
 
 inherit pypi setuptools3
@@ -11,6 +12,5 @@ inherit pypi setuptools3
 RDEPENDS:${PN} += " \
 	${PYTHON_PN}-dnspython \
 	${PYTHON_PN}-six \
-	${PYTHON_PN}-distutils \
 	${PYTHON_PN}-greenlet \
 "
-- 
2.39.2

Re: [oe] [PATCH 11/20] python3-eventlet: backport a patch to remove distutils dependency

[Khem Raj]

On Thu, Dec 14, 2023 at 11:53 PM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  ...o-host-0-is-not-supported-on-OpenInd.patch | 78 +++++++++++++++++++
>  .../python/python3-eventlet_0.33.3.bb         |  2 +-
>  2 files changed, 79 insertions(+), 1 deletion(-)
>  create mode 100644 meta-python/recipes-devtools/python/python3-eventlet/0001-tests-getaddrinfo-host-0-is-not-supported-on-OpenInd.patch
>
> diff --git a/meta-python/recipes-devtools/python/python3-eventlet/0001-tests-getaddrinfo-host-0-is-not-supported-on-OpenInd.patch b/meta-python/recipes-devtools/python/python3-eventlet/0001-tests-getaddrinfo-host-0-is-not-supported-on-OpenInd.patch
> new file mode 100644
> index 000000000..61a37d94e
> --- /dev/null
> +++ b/meta-python/recipes-devtools/python/python3-eventlet/0001-tests-getaddrinfo-host-0-is-not-supported-on-OpenInd.patch
> @@ -0,0 +1,78 @@
> +From ac2f960a50710bb257e87bed4e3c95a746f2a0fe Mon Sep 17 00:00:00 2001
> +From: Sergey Shepelev <temotor@gmail.com>
> +Date: Mon, 27 Mar 2023 22:07:15 +0300
> +Subject: [PATCH] tests: getaddrinfo(host, 0) is not supported on OpenIndiana
> + platform
> +
> +https://github.com/eventlet/eventlet/issues/791
> +
> +Upstream-Status: Backport

This status needs link to commit in upstream repo

> +Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> +---
> + tests/greendns_test.py | 14 +++++++-------
> + 1 file changed, 7 insertions(+), 7 deletions(-)
> +
> +diff --git a/tests/greendns_test.py b/tests/greendns_test.py
> +index feab2b6..3802f44 100644
> +--- a/tests/greendns_test.py
> ++++ b/tests/greendns_test.py
> +@@ -613,14 +613,14 @@ class TestGetaddrinfo(tests.LimitedTestCase):
> +     def test_getaddrinfo_only_a_ans(self):
> +         greendns.resolve = _make_mock_resolve()
> +         greendns.resolve.add('example.com', '1.2.3.4')
> +-        res = greendns.getaddrinfo('example.com', 0)
> ++        res = greendns.getaddrinfo('example.com', None)
> +         addr = [('1.2.3.4', 0)] * len(res)
> +         assert addr == [ai[-1] for ai in res]
> +
> +     def test_getaddrinfo_only_aaaa_ans(self):
> +         greendns.resolve = _make_mock_resolve()
> +         greendns.resolve.add('example.com', 'dead:beef::1')
> +-        res = greendns.getaddrinfo('example.com', 0)
> ++        res = greendns.getaddrinfo('example.com', None)
> +         addr = [('dead:beef::1', 0, 0, 0)] * len(res)
> +         assert addr == [ai[-1] for ai in res]
> +
> +@@ -637,7 +637,7 @@ class TestGetaddrinfo(tests.LimitedTestCase):
> +         res.raises = greendns.dns.exception.Timeout
> +         greendns.resolver._resolver = res()
> +
> +-        result = greendns.getaddrinfo('example.com', 0, 0)
> ++        result = greendns.getaddrinfo('example.com', None, 0)
> +         addr = [('1.2.3.4', 0)] * len(result)
> +         assert addr == [ai[-1] for ai in result]
> +
> +@@ -654,7 +654,7 @@ class TestGetaddrinfo(tests.LimitedTestCase):
> +         res.raises = greendns.dns.exception.DNSException
> +         greendns.resolver._resolver = res()
> +
> +-        result = greendns.getaddrinfo('example.com', 0, 0)
> ++        result = greendns.getaddrinfo('example.com', None, 0)
> +         addr = [('1.2.3.4', 0)] * len(result)
> +         assert addr == [ai[-1] for ai in result]
> +
> +@@ -667,7 +667,7 @@ class TestGetaddrinfo(tests.LimitedTestCase):
> +         greendns.resolver._resolver = res()
> +
> +         with tests.assert_raises(socket.gaierror):
> +-            greendns.getaddrinfo('example.com', 0, 0)
> ++            greendns.getaddrinfo('example.com', None, 0)
> +
> +     def test_getaddrinfo_hosts_only_dns_error(self):
> +         hostsres = _make_mock_base_resolver()
> +@@ -678,13 +678,13 @@ class TestGetaddrinfo(tests.LimitedTestCase):
> +         greendns.resolver._resolver = res()
> +
> +         with tests.assert_raises(socket.gaierror):
> +-            greendns.getaddrinfo('example.com', 0, 0)
> ++            greendns.getaddrinfo('example.com', None, 0)
> +
> +     def test_canonname(self):
> +         greendns.resolve = _make_mock_resolve()
> +         greendns.resolve.add('host.example.com', '1.2.3.4')
> +         greendns.resolve_cname = self._make_mock_resolve_cname()
> +-        res = greendns.getaddrinfo('host.example.com', 0,
> ++        res = greendns.getaddrinfo('host.example.com', None,
> +                                    0, 0, 0, socket.AI_CANONNAME)
> +         assert res[0][3] == 'cname.example.com'
> +
> diff --git a/meta-python/recipes-devtools/python/python3-eventlet_0.33.3.bb b/meta-python/recipes-devtools/python/python3-eventlet_0.33.3.bb
> index c1256661b..fe4d4f020 100644
> --- a/meta-python/recipes-devtools/python/python3-eventlet_0.33.3.bb
> +++ b/meta-python/recipes-devtools/python/python3-eventlet_0.33.3.bb
> @@ -4,6 +4,7 @@ SECTION = "devel/python"
>  LICENSE = "MIT"
>  LIC_FILES_CHKSUM = "file://LICENSE;md5=56472ad6de4caf50e05332a34b66e778"
>
> +SRC_URI += "file://0001-tests-getaddrinfo-host-0-is-not-supported-on-OpenInd.patch"
>  SRC_URI[sha256sum] = "722803e7eadff295347539da363d68ae155b8b26ae6a634474d0a920be73cfda"
>
>  inherit pypi setuptools3
> @@ -11,6 +12,5 @@ inherit pypi setuptools3
>  RDEPENDS:${PN} += " \
>         ${PYTHON_PN}-dnspython \
>         ${PYTHON_PN}-six \
> -       ${PYTHON_PN}-distutils \
>         ${PYTHON_PN}-greenlet \
>  "
> --
> 2.39.2
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#107504): https://lists.openembedded.org/g/openembedded-devel/message/107504
> Mute This Topic: https://lists.openembedded.org/mt/103186667/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

[PATCH 12/20] python3-unoconv: rely on setuptools to obtain distutils copy

[Alexander Kanavin]

The source contains:
from distutils.version import LooseVersion

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta-python/recipes-devtools/python/python3-unoconv_0.9.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-python/recipes-devtools/python/python3-unoconv_0.9.0.bb b/meta-python/recipes-devtools/python/python3-unoconv_0.9.0.bb
index 3c944b4f2..be1dab476 100644
--- a/meta-python/recipes-devtools/python/python3-unoconv_0.9.0.bb
+++ b/meta-python/recipes-devtools/python/python3-unoconv_0.9.0.bb
@@ -11,7 +11,7 @@ inherit pypi setuptools3
 PYPI_PACKAGE="unoconv"
 
 RDEPENDS:${PN} += "\
-    ${PYTHON_PN}-distutils \
+    ${PYTHON_PN}-setuptools \
     ${PYTHON_PN}-core \
     ${PYTHON_PN}-shell \
 "
-- 
2.39.2

[PATCH 13/20] python3-astroid: remove unneeded distutils dependency

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta-python/recipes-devtools/python/python3-astroid_3.0.1.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-python/recipes-devtools/python/python3-astroid_3.0.1.bb b/meta-python/recipes-devtools/python/python3-astroid_3.0.1.bb
index db3ef4392..348dc2ebb 100644
--- a/meta-python/recipes-devtools/python/python3-astroid_3.0.1.bb
+++ b/meta-python/recipes-devtools/python/python3-astroid_3.0.1.bb
@@ -21,7 +21,6 @@ FILES:${PN}-tests += " \
 "
 
 RDEPENDS:${PN}:class-target += "\
-    ${PYTHON_PN}-distutils \
     ${PYTHON_PN}-lazy-object-proxy \
     ${PYTHON_PN}-logging \
     ${PYTHON_PN}-six \
-- 
2.39.2

[PATCH 14/20] python3-django: remove unneeded distutils dependency

[Alexander Kanavin]

Nothing in the source tree requires it at runtime.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta-python/recipes-devtools/python/python-django.inc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-python/recipes-devtools/python/python-django.inc b/meta-python/recipes-devtools/python/python-django.inc
index e030ff408..11d5e6301 100644
--- a/meta-python/recipes-devtools/python/python-django.inc
+++ b/meta-python/recipes-devtools/python/python-django.inc
@@ -28,7 +28,6 @@ RDEPENDS:${PN} += "\
     ${PYTHON_PN}-threading \
     ${PYTHON_PN}-unixadmin \
     ${PYTHON_PN}-xml \
-    ${PYTHON_PN}-distutils \
 "
 
 CVE_PRODUCT = "django"
-- 
2.39.2

[PATCH 15/20] python3-pillow: remove unneeded distutils dependency

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta-python/recipes-devtools/python/python3-pillow_10.1.0.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-python/recipes-devtools/python/python3-pillow_10.1.0.bb b/meta-python/recipes-devtools/python/python3-pillow_10.1.0.bb
index 322c90eda..f895b1db3 100644
--- a/meta-python/recipes-devtools/python/python3-pillow_10.1.0.bb
+++ b/meta-python/recipes-devtools/python/python3-pillow_10.1.0.bb
@@ -39,7 +39,6 @@ RDEPENDS:${PN}-ptest += " \
     jpeg-tools \
     libwebp \
     ${PYTHON_PN}-core \
-    ${PYTHON_PN}-distutils \
     ${PYTHON_PN}-image \
     ${PYTHON_PN}-mmap \
     ${PYTHON_PN}-pytest \
-- 
2.39.2

[PATCH 16/20] python3-grpcio: update 1.56.2 -> 1.59.3

[Alexander Kanavin]

This is needed for python 3.12 compatibility.

Drop 0001-direct_mmap-Use-off_t-on-linux.patch as
issue resolved upstream.

Other dropped patches are all due to the code being significantly refactored upstream;
if the issues persist, please write updated patches.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../0001-Include-missing-cstdint-header.patch |  6 +-
 .../0001-direct_mmap-Use-off_t-on-linux.patch | 42 -----------
 ...-Do-not-mix-C-and-C-compiler-options.patch | 73 -------------------
 ...clude-unistd.h-for-open-close-C-APIs.patch |  6 +-
 .../python3-grpcio/abseil-ppc-fixes.patch     | 63 +++++++++-------
 .../python3-grpcio/mips_bigendian.patch       | 17 -----
 .../ppc-boringssl-support.patch               | 17 -----
 ...cio_1.56.2.bb => python3-grpcio_1.59.3.bb} | 14 ++--
 8 files changed, 46 insertions(+), 192 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio/0001-direct_mmap-Use-off_t-on-linux.patch
 delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch
 delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio/mips_bigendian.patch
 delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch
 rename meta-python/recipes-devtools/python/{python3-grpcio_1.56.2.bb => python3-grpcio_1.59.3.bb} (63%)

diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-Include-missing-cstdint-header.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-Include-missing-cstdint-header.patch
index f970cf3c3..5cd94dee9 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio/0001-Include-missing-cstdint-header.patch
+++ b/meta-python/recipes-devtools/python/python3-grpcio/0001-Include-missing-cstdint-header.patch
@@ -1,4 +1,4 @@
-From 752e30eebe5b91c323bafcbea8d450dd5683701a Mon Sep 17 00:00:00 2001
+From 252aa78526287fe033c5656cd166e551fa5daa88 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 30 Jan 2023 10:31:10 -0800
 Subject: [PATCH] Include missing <cstdint> header
@@ -11,6 +11,7 @@ int32_t.
 
 Upstream-Status: Submitted [https://code-review.googlesource.com/c/re2/+/60970]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
 ---
  third_party/re2/util/pcre.h | 1 +
  1 file changed, 1 insertion(+)
@@ -27,6 +28,3 @@ index 896b0bd..271a005 100644
  
  #ifdef USEPCRE
  #include <pcre.h>
--- 
-2.39.1
-
diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-direct_mmap-Use-off_t-on-linux.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-direct_mmap-Use-off_t-on-linux.patch
deleted file mode 100644
index 49df528d7..000000000
--- a/meta-python/recipes-devtools/python/python3-grpcio/0001-direct_mmap-Use-off_t-on-linux.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 45fdade6c0415ec5af3f9312e6311a4ccc682a7b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 28 Dec 2022 18:24:21 -0800
-Subject: [PATCH] direct_mmap: Use off_t on linux
-
-off64_t is not provided without defining _LARGEFILE64_SOURCE on musl
-this define is not defined automatically like glibc where it gets
-defined when _GNU_SOURCE is defined. Using off_t makes it portable
-across musl/glibc and for using 64bit off_t on glibc 32bit systems
--D_FILE_OFFSET_BITS=64 can be defined during build via CXXFLAGS
-
-Upstream-Status: Submitted [https://github.com/abseil/abseil-cpp/pull/1349]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- absl/base/internal/direct_mmap.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/absl/base/internal/direct_mmap.h b/absl/base/internal/direct_mmap.h
-index 815b8d23..fdf88f0b 100644
---- a/absl/base/internal/direct_mmap.h
-+++ b/absl/base/internal/direct_mmap.h
-@@ -72,7 +72,7 @@ namespace base_internal {
- // Platform specific logic extracted from
- // https://chromium.googlesource.com/linux-syscall-support/+/master/linux_syscall_support.h
- inline void* DirectMmap(void* start, size_t length, int prot, int flags, int fd,
--                        off64_t offset) noexcept {
-+                        off_t offset) noexcept {
- #if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) || \
-     defined(__m68k__) || defined(__sh__) ||                                  \
-     (defined(__hppa__) && !defined(__LP64__)) ||                             \
-@@ -102,7 +102,7 @@ inline void* DirectMmap(void* start, size_t length, int prot, int flags, int fd,
- #else
-   return reinterpret_cast<void*>(
-       syscall(SYS_mmap2, start, length, prot, flags, fd,
--              static_cast<off_t>(offset / pagesize)));
-+              offset / pagesize));
- #endif
- #elif defined(__s390x__)
-   // On s390x, mmap() arguments are passed in memory.
--- 
-2.39.0
-
diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch
deleted file mode 100644
index 13911ddcf..000000000
--- a/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From de10fbc2386dcac3ab810c49b6977b2ee01bf426 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 17 Feb 2021 13:30:23 -0800
-Subject: [PATCH] setup.py: Do not mix C and C++ compiler options
-
-EXTRA_ENV_COMPILE_ARGS is used both with CC and CXX
-so using -std=c++11 or -std=gnu99 together will cause
-build time errors espcially with clang
-
-Keep '-std=c++11' to fix native build error
-with old gcc (such as gcc 5.4.0 on ubuntu 16.04), for clang
-we will remove them through GRPC_PYTHON_CFLAGS at do_compile
-in bb recipe.
-
-While export CC="gcc ", cc_args is None, it will
-cause subprocess.Popen always return 1. On centos 8, if you don't
-install package libatomic, there will be a native build error
-`cannot find /usr/lib64/libatomic.so.1.2.0'.
-
-Add no harm '-g' to cc_args if cc_args is empty.
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
----
- setup.py                      | 11 +++++++----
- src/python/grpcio/commands.py |  5 ++++-
- 2 files changed, 11 insertions(+), 5 deletions(-)
-
---- a/setup.py
-+++ b/setup.py
-@@ -206,8 +206,11 @@ def check_linker_need_libatomic():
-     """Test if linker on system needs libatomic."""
-     code_test = (b'#include <atomic>\n' +
-                  b'int main() { return std::atomic<int64_t>{}; }')
--    cxx = shlex.split(os.environ.get('CXX', 'c++'))
--    cpp_test = subprocess.Popen(cxx + ['-x', 'c++', '-std=c++14', '-'],
-+    cxx, cxx_args = os.environ.get('CXX').split(' ', 1) or 'c++'
-+    if not cxx_args:
-+      cxx_args = "-g"
-+
-+    cpp_test = subprocess.Popen([cxx, cxx_args, '-x', 'c++', '-std=c++14', '-'],
-                                 stdin=PIPE,
-                                 stdout=PIPE,
-                                 stderr=PIPE)
-@@ -216,8 +219,8 @@ def check_linker_need_libatomic():
-         return False
-     # Double-check to see if -latomic actually can solve the problem.
-     # https://github.com/grpc/grpc/issues/22491
--    cpp_test = subprocess.Popen(cxx +
--                                ['-x', 'c++', '-std=c++14', '-', '-latomic'],
-+    cpp_test = subprocess.Popen(
-+                                [cxx, cxx_args, '-x', 'c++', '-std=c++14', '-', '-latomic'],
-                                 stdin=PIPE,
-                                 stdout=PIPE,
-                                 stderr=PIPE)
---- a/src/python/grpcio/commands.py
-+++ b/src/python/grpcio/commands.py
-@@ -228,8 +228,10 @@ class BuildExt(build_ext.build_ext):
-             """
-             try:
-                 # TODO(lidiz) Remove the generated a.out for success tests.
--                cc = os.environ.get('CC', 'cc')
--                cc_test = subprocess.Popen([cc, '-x', 'c', '-std=c++14', '-'],
-+                cc_test, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc'
-+                if not cc_args:
-+                    cc_args = "-g"
-+                cc_test = subprocess.Popen([cc_test, cc_args, '-x', 'c', '-std=c++14', '-'],
-                                            stdin=subprocess.PIPE,
-                                            stdout=subprocess.PIPE,
-                                            stderr=subprocess.PIPE)
diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch
index 918c6c860..a5e767029 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio/0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch
+++ b/meta-python/recipes-devtools/python/python3-grpcio/0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch
@@ -1,4 +1,4 @@
-From 4432b9a296c9c287dfe281b4d464dfd03e4eb721 Mon Sep 17 00:00:00 2001
+From 6ede7d01b18a4d9eeaccd25f5c1ab9985cb65307 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 12 Feb 2023 21:25:04 -0800
 Subject: [PATCH] zlib: Include unistd.h for open/close C APIs
@@ -6,6 +6,7 @@ Subject: [PATCH] zlib: Include unistd.h for open/close C APIs
 Upstream-Status: Pending
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
 ---
  third_party/zlib/gzguts.h | 1 +
  1 file changed, 1 insertion(+)
@@ -22,6 +23,3 @@ index 57faf37..3c700c2 100644
  #include "zlib.h"
  #ifdef STDC
  #  include <string.h>
--- 
-2.39.1
-
diff --git a/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch b/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch
index 4100cf63f..4bb60b6e2 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch
+++ b/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch
@@ -1,4 +1,7 @@
-An all-in-one patch that fixes several issues:
+From 9cec6297effa9fab6f0c71e342046daceecd7d4d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 13 Mar 2021 10:26:25 -0800
+Subject: [PATCH] An all-in-one patch that fixes several issues:
 
 1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl)
 2) powerpc stacktrace implementation only works on glibc (disabled on musl)
@@ -7,19 +10,21 @@ An all-in-one patch that fixes several issues:
 
 Sourced from void linux
 
+Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Signed-off-by: Xu Huan <xuhuan.fnst@fujitsu.com>
----
-Upstream-Status: Pending
 
- absl/base/internal/unscaledcycleclock.cc    | 4 ++--
- absl/base/internal/unscaledcycleclock.h     | 3 ++-
- absl/debugging/internal/examine_stack.cc    | 8 +++++++-
- absl/debugging/internal/stacktrace_config.h | 2 +-
+---
+ .../abseil-cpp/absl/base/internal/unscaledcycleclock.cc   | 4 ++--
+ .../absl/base/internal/unscaledcycleclock_config.h        | 3 ++-
+ .../abseil-cpp/absl/debugging/internal/examine_stack.cc   | 8 +++++++-
+ .../absl/debugging/internal/stacktrace_config.h           | 2 +-
  4 files changed, 12 insertions(+), 5 deletions(-)
 
---- a/absl/base/internal/unscaledcycleclock.cc
-+++ b/absl/base/internal/unscaledcycleclock.cc
+diff --git a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
+index b1c396c..d62bfd6 100644
+--- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
++++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
 @@ -20,7 +20,7 @@
  #include <intrin.h>
  #endif
@@ -38,8 +43,24 @@ Upstream-Status: Pending
  
  int64_t UnscaledCycleClock::Now() {
  #ifdef __GLIBC__
---- a/absl/debugging/internal/examine_stack.cc
-+++ b/absl/debugging/internal/examine_stack.cc
+diff --git a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h
+index 24b324a..5e232c1 100644
+--- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h
++++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h
+@@ -21,7 +21,8 @@
+ 
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+-    defined(__powerpc__) || defined(__ppc__) || defined(__riscv) ||     \
++    ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
++    defined(__riscv) ||     \
+     defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
+diff --git a/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc b/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
+index 5786322..72c7c46 100644
+--- a/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
++++ b/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
 @@ -33,6 +33,10 @@
  #include <csignal>
  #include <cstdio>
@@ -51,7 +72,7 @@ Upstream-Status: Pending
  #include "absl/base/attributes.h"
  #include "absl/base/internal/raw_logging.h"
  #include "absl/base/macros.h"
-@@ -174,8 +178,10 @@ void* GetProgramCounter(void* const vuc)
+@@ -174,8 +178,10 @@ void* GetProgramCounter(void* const vuc) {
      return reinterpret_cast<void*>(context->uc_mcontext.pc);
  #elif defined(__powerpc64__)
      return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]);
@@ -63,8 +84,10 @@ Upstream-Status: Pending
  #elif defined(__riscv)
      return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]);
  #elif defined(__s390__) && !defined(__s390x__)
---- a/absl/debugging/internal/stacktrace_config.h
-+++ b/absl/debugging/internal/stacktrace_config.h
+diff --git a/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h b/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
+index 3929b1b..23d5e50 100644
+--- a/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
++++ b/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
 @@ -60,7 +60,7 @@
  #elif defined(__i386__) || defined(__x86_64__)
  #define ABSL_STACKTRACE_INL_HEADER \
@@ -74,15 +97,3 @@ Upstream-Status: Pending
  #define ABSL_STACKTRACE_INL_HEADER \
    "absl/debugging/internal/stacktrace_powerpc-inl.inc"
  #elif defined(__aarch64__)
---- a/absl/base/internal/unscaledcycleclock_config.h
-+++ b/absl/base/internal/unscaledcycleclock_config.h
-@@ -21,7 +21,8 @@
- 
- // The following platforms have an implementation of a hardware counter.
- #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
--    defined(__powerpc__) || defined(__ppc__) || defined(__riscv) ||     \
-+    ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
-+    defined(__riscv) ||     \
-     defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
- #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
- #else
diff --git a/meta-python/recipes-devtools/python/python3-grpcio/mips_bigendian.patch b/meta-python/recipes-devtools/python/python3-grpcio/mips_bigendian.patch
deleted file mode 100644
index 088ce33fc..000000000
--- a/meta-python/recipes-devtools/python/python3-grpcio/mips_bigendian.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: Pending
-
---- a/third_party/boringssl-with-bazel/src/include/openssl/base.h
-+++ b/third_party/boringssl-with-bazel/src/include/openssl/base.h
-@@ -102,10 +102,10 @@ extern "C" {
- #elif (defined(__PPC__) || defined(__powerpc__))
- #define OPENSSL_32_BIT
- #define OPENSSL_PPC
--#elif defined(__MIPSEL__) && !defined(__LP64__)
-+#elif defined(__mips__) && !defined(__LP64__)
- #define OPENSSL_32_BIT
- #define OPENSSL_MIPS
--#elif defined(__MIPSEL__) && defined(__LP64__)
-+#elif defined(__mips__) && defined(__LP64__)
- #define OPENSSL_64_BIT
- #define OPENSSL_MIPS64
- #elif defined(__riscv) && __SIZEOF_POINTER__ == 8
diff --git a/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch b/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch
deleted file mode 100644
index 5dacc689f..000000000
--- a/meta-python/recipes-devtools/python/python3-grpcio/ppc-boringssl-support.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Let boringSSL compile on ppc32 bit
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
---- a/third_party/boringssl-with-bazel/src/include/openssl/base.h
-+++ b/third_party/boringssl-with-bazel/src/include/openssl/base.h
-@@ -96,6 +96,9 @@ extern "C" {
- #elif defined(__ARMEL__) || defined(_M_ARM)
- #define OPENSSL_32_BIT
- #define OPENSSL_ARM
-+#elif (defined(__PPC__) || defined(__powerpc__))
-+#define OPENSSL_32_BIT
-+#define OPENSSL_PPC
- #elif defined(__MIPSEL__) && !defined(__LP64__)
- #define OPENSSL_32_BIT
- #define OPENSSL_MIPS
diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.56.2.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.59.3.bb
similarity index 63%
rename from meta-python/recipes-devtools/python/python3-grpcio_1.56.2.bb
rename to meta-python/recipes-devtools/python/python3-grpcio_1.59.3.bb
index c34391dd6..7b1631527 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio_1.56.2.bb
+++ b/meta-python/recipes-devtools/python/python3-grpcio_1.59.3.bb
@@ -6,15 +6,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906"
 
 DEPENDS += "${PYTHON_PN}-protobuf"
 
-SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch"
-SRC_URI:append:class-target = " file://ppc-boringssl-support.patch \
-                                file://mips_bigendian.patch \
-                                file://0001-Include-missing-cstdint-header.patch \
-                                file://abseil-ppc-fixes.patch;patchdir=third_party/abseil-cpp \
-                                file://0001-direct_mmap-Use-off_t-on-linux.patch;patchdir=third_party/abseil-cpp \
-                                file://0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch \
-"
-SRC_URI[sha256sum] = "0ff789ae7d8ddd76d2ac02e7d13bfef6fc4928ac01e1dcaa182be51b6bcc0aaa"
+SRC_URI += "file://0001-Include-missing-cstdint-header.patch \
+           file://abseil-ppc-fixes.patch \
+           file://0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch \
+           "
+SRC_URI[sha256sum] = "7800f99568a74a06ebdccd419dd1b6e639b477dcaf6da77ea702f8fb14ce5f80"
 
 RDEPENDS:${PN} = "${PYTHON_PN}-protobuf \
                   ${PYTHON_PN}-setuptools \
-- 
2.39.2

[PATCH 17/20] gstd: correctly delete files in do_install

[Alexander Kanavin]

gstd always installs these in /usr, so root_prefix would
work only if usrmerge is in DISTRO_FEATURES.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../recipes-multimedia/gstreamer-1.0/gstd_git.bb            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb
index cabbf2cc1..87792491a 100644
--- a/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb
+++ b/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb
@@ -20,9 +20,9 @@ GTKDOC_MESON_OPTION = "enable-gtk-doc"
 inherit meson pkgconfig gettext gtk-doc python3native python3-dir python3targetconfig
 
 do_install:append() {
-        rmdir ${D}${root_prefix}${localstatedir}/run/${BPN} ${D}${root_prefix}${localstatedir}/run \
-              ${D}${root_prefix}${localstatedir}/log/${BPN} ${D}${root_prefix}${localstatedir}/log \
-              ${D}${root_prefix}${localstatedir}
+        rmdir ${D}${exec_prefix}${localstatedir}/run/${BPN} ${D}${exec_prefix}${localstatedir}/run \
+              ${D}${exec_prefix}${localstatedir}/log/${BPN} ${D}${exec_prefix}${localstatedir}/log \
+              ${D}${exec_prefix}${localstatedir}
         rm -f ${D}${bindir}/gst-client ${D}${bindir}/gstd-client
         if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
                 install -d ${D}${sysconfdir}/tmpfiles.d
-- 
2.39.2

[PATCH 18/20] libplist: fix python 3.12 compatibility

[Alexander Kanavin]

Ticket:
https://github.com/libimobiledevice/libplist/issues/247

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta-oe/recipes-extended/libimobiledevice/libplist_2.3.0.bb | 4 ++++
 meta-oe/recipes-extended/libimobiledevice/libplist_git.bb   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/meta-oe/recipes-extended/libimobiledevice/libplist_2.3.0.bb b/meta-oe/recipes-extended/libimobiledevice/libplist_2.3.0.bb
index f636990f8..3eefda733 100644
--- a/meta-oe/recipes-extended/libimobiledevice/libplist_2.3.0.bb
+++ b/meta-oe/recipes-extended/libimobiledevice/libplist_2.3.0.bb
@@ -22,6 +22,10 @@ CVE_STATUS_LIBLIST = " \
     CVE-2017-5836 \
 "
 
+do_configure:prepend() {
+    rm ${S}/m4/ax_python_devel.m4
+}
+
 do_install:append () {
     if [ -e ${D}${libdir}/python*/site-packages/plist/_plist.so ]; then
         chrpath -d ${D}${libdir}/python*/site-packages/plist/_plist.so
diff --git a/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb b/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb
index f8e7f98df..0142bcbaf 100644
--- a/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb
+++ b/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb
@@ -23,6 +23,10 @@ CVE_STATUS_LIBLIST = " \
     CVE-2017-5836 \
 "
 
+do_configure:prepend() {
+    rm ${S}/m4/ax_python_devel.m4
+}
+
 do_install:append () {
     if [ -e ${D}${libdir}/python*/site-packages/plist/_plist.so ]; then
         chrpath -d ${D}${libdir}/python*/site-packages/plist/_plist.so
-- 
2.39.2

[PATCH 19/20] libcamera: skip until upstream resolves python 3.12 compatibility

[Alexander Kanavin]

I'd note that imp module has been deprecated for years, so that's what
happens when deprecation warnings are ignored.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb | 1 +
 .../packagegroups/packagegroup-meta-multimedia.bb               | 1 -
 meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb   | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb
index 2a3c6473e..9c04d7434 100644
--- a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb
+++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb
@@ -73,3 +73,4 @@ FILES:${PN}-gst = "${libdir}/gstreamer-1.0"
 # both 32 and 64 bit file APIs.
 GLIBC_64BIT_TIME_FLAGS = ""
 
+SKIP_RECIPE[libcamera] ?= "Not compatible with python 3.12, see https://bugs.libcamera.org/show_bug.cgi?id=206"
diff --git a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
index 672c8abc9..6ca4d539f 100644
--- a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
+++ b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
@@ -42,7 +42,6 @@ RDEPENDS:packagegroup-meta-multimedia = "\
     tearsofsteel-1080p \
     pipewire \
     ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains("DISTRO_FEATURES", "x11", "projucer", "", d), "", d)} \
-    libcamera \
     vorbis-tools \
     libopenmpt \
     mimic \
diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb
index b4da781f0..4d894349a 100644
--- a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb
+++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb
@@ -86,7 +86,7 @@ PACKAGECONFIG:class-target ??= " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-system-service systemd-user-service', '', d)} \
     ${@bb.utils.filter('DISTRO_FEATURES', 'alsa vulkan pulseaudio', d)} \
     ${PIPEWIRE_SESSION_MANAGER} \
-    ${FFMPEG_AVAILABLE} avahi flatpak gstreamer gsettings jack libusb pw-cat raop sndfile v4l2 udev volume webrtc-echo-cancelling libcamera readline \
+    ${FFMPEG_AVAILABLE} avahi flatpak gstreamer gsettings jack libusb pw-cat raop sndfile v4l2 udev volume webrtc-echo-cancelling readline \
 "
 
 # "jack" and "pipewire-jack" packageconfigs cannot be both enabled,
-- 
2.39.2

Re: [PATCH 19/20] libcamera: skip until upstream resolves python 3.12 compatibility

[Kieran Bingham]

+libcamera-devel mailing list

Quoting Alexander Kanavin (2023-12-15 07:52:38)
> I'd note that imp module has been deprecated for years, so that's what
> happens when deprecation warnings are ignored.

Can you tell me more about what this issue is please? I'm not aware of
it at all.

--
Kieran


> 
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb | 1 +
>  .../packagegroups/packagegroup-meta-multimedia.bb               | 1 -
>  meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb   | 2 +-
>  3 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb
> index 2a3c6473e..9c04d7434 100644
> --- a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb
> +++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb
> @@ -73,3 +73,4 @@ FILES:${PN}-gst = "${libdir}/gstreamer-1.0"
>  # both 32 and 64 bit file APIs.
>  GLIBC_64BIT_TIME_FLAGS = ""
>  
> +SKIP_RECIPE[libcamera] ?= "Not compatible with python 3.12, see https://bugs.libcamera.org/show_bug.cgi?id=206"
> diff --git a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
> index 672c8abc9..6ca4d539f 100644
> --- a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
> +++ b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
> @@ -42,7 +42,6 @@ RDEPENDS:packagegroup-meta-multimedia = "\
>      tearsofsteel-1080p \
>      pipewire \
>      ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains("DISTRO_FEATURES", "x11", "projucer", "", d), "", d)} \
> -    libcamera \
>      vorbis-tools \
>      libopenmpt \
>      mimic \
> diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb
> index b4da781f0..4d894349a 100644
> --- a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb
> +++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb
> @@ -86,7 +86,7 @@ PACKAGECONFIG:class-target ??= " \
>      ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-system-service systemd-user-service', '', d)} \
>      ${@bb.utils.filter('DISTRO_FEATURES', 'alsa vulkan pulseaudio', d)} \
>      ${PIPEWIRE_SESSION_MANAGER} \
> -    ${FFMPEG_AVAILABLE} avahi flatpak gstreamer gsettings jack libusb pw-cat raop sndfile v4l2 udev volume webrtc-echo-cancelling libcamera readline \
> +    ${FFMPEG_AVAILABLE} avahi flatpak gstreamer gsettings jack libusb pw-cat raop sndfile v4l2 udev volume webrtc-echo-cancelling readline \
>  "
>  
>  # "jack" and "pipewire-jack" packageconfigs cannot be both enabled,
> -- 
> 2.39.2
> 
>

Re: [PATCH 19/20] libcamera: skip until upstream resolves python 3.12 compatibility

[Kieran Bingham]

Quoting Kieran Bingham (2023-12-15 10:16:20)
> +libcamera-devel mailing list
> 
> Quoting Alexander Kanavin (2023-12-15 07:52:38)
> > I'd note that imp module has been deprecated for years, so that's what
> > happens when deprecation warnings are ignored.
> 
> Can you tell me more about what this issue is please? I'm not aware of
> it at all.
> 
> --
> Kieran
> 
> 
> > 
> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > ---
> >  meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb | 1 +
> >  .../packagegroups/packagegroup-meta-multimedia.bb               | 1 -
> >  meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb   | 2 +-
> >  3 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb
> > index 2a3c6473e..9c04d7434 100644
> > --- a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb
> > +++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb
> > @@ -73,3 +73,4 @@ FILES:${PN}-gst = "${libdir}/gstreamer-1.0"
> >  # both 32 and 64 bit file APIs.
> >  GLIBC_64BIT_TIME_FLAGS = ""
> >  
> > +SKIP_RECIPE[libcamera] ?= "Not compatible with python 3.12, see https://bugs.libcamera.org/show_bug.cgi?id=206"


Aha, the clue was buried here.

--
Kieran


> > diff --git a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
> > index 672c8abc9..6ca4d539f 100644
> > --- a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
> > +++ b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
> > @@ -42,7 +42,6 @@ RDEPENDS:packagegroup-meta-multimedia = "\
> >      tearsofsteel-1080p \
> >      pipewire \
> >      ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains("DISTRO_FEATURES", "x11", "projucer", "", d), "", d)} \
> > -    libcamera \
> >      vorbis-tools \
> >      libopenmpt \
> >      mimic \
> > diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb
> > index b4da781f0..4d894349a 100644
> > --- a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb
> > +++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb
> > @@ -86,7 +86,7 @@ PACKAGECONFIG:class-target ??= " \
> >      ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-system-service systemd-user-service', '', d)} \
> >      ${@bb.utils.filter('DISTRO_FEATURES', 'alsa vulkan pulseaudio', d)} \
> >      ${PIPEWIRE_SESSION_MANAGER} \
> > -    ${FFMPEG_AVAILABLE} avahi flatpak gstreamer gsettings jack libusb pw-cat raop sndfile v4l2 udev volume webrtc-echo-cancelling libcamera readline \
> > +    ${FFMPEG_AVAILABLE} avahi flatpak gstreamer gsettings jack libusb pw-cat raop sndfile v4l2 udev volume webrtc-echo-cancelling readline \
> >  "
> >  
> >  # "jack" and "pipewire-jack" packageconfigs cannot be both enabled,
> > -- 
> > 2.39.2
> > 
> >

Re: [PATCH 19/20] libcamera: skip until upstream resolves python 3.12 compatibility

[Alexander Kanavin]

That's right.

This page provides hints for how to replace usage of imp with
equivalents in importlib:
https://docs.python.org/3.11/library/imp.html

Alex

On Fri, 15 Dec 2023 at 11:18, Kieran Bingham
<kieran.bingham@ideasonboard.com> wrote:
>
> Quoting Kieran Bingham (2023-12-15 10:16:20)
> > +libcamera-devel mailing list
> >
> > Quoting Alexander Kanavin (2023-12-15 07:52:38)
> > > I'd note that imp module has been deprecated for years, so that's what
> > > happens when deprecation warnings are ignored.
> >
> > Can you tell me more about what this issue is please? I'm not aware of
> > it at all.
> >
> > --
> > Kieran
> >
> >
> > >
> > > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > > ---
> > >  meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb | 1 +
> > >  .../packagegroups/packagegroup-meta-multimedia.bb               | 1 -
> > >  meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb   | 2 +-
> > >  3 files changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb
> > > index 2a3c6473e..9c04d7434 100644
> > > --- a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb
> > > +++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb
> > > @@ -73,3 +73,4 @@ FILES:${PN}-gst = "${libdir}/gstreamer-1.0"
> > >  # both 32 and 64 bit file APIs.
> > >  GLIBC_64BIT_TIME_FLAGS = ""
> > >
> > > +SKIP_RECIPE[libcamera] ?= "Not compatible with python 3.12, see https://bugs.libcamera.org/show_bug.cgi?id=206"
>
>
> Aha, the clue was buried here.
>
> --
> Kieran
>
>
> > > diff --git a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
> > > index 672c8abc9..6ca4d539f 100644
> > > --- a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
> > > +++ b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
> > > @@ -42,7 +42,6 @@ RDEPENDS:packagegroup-meta-multimedia = "\
> > >      tearsofsteel-1080p \
> > >      pipewire \
> > >      ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains("DISTRO_FEATURES", "x11", "projucer", "", d), "", d)} \
> > > -    libcamera \
> > >      vorbis-tools \
> > >      libopenmpt \
> > >      mimic \
> > > diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb
> > > index b4da781f0..4d894349a 100644
> > > --- a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb
> > > +++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb
> > > @@ -86,7 +86,7 @@ PACKAGECONFIG:class-target ??= " \
> > >      ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-system-service systemd-user-service', '', d)} \
> > >      ${@bb.utils.filter('DISTRO_FEATURES', 'alsa vulkan pulseaudio', d)} \
> > >      ${PIPEWIRE_SESSION_MANAGER} \
> > > -    ${FFMPEG_AVAILABLE} avahi flatpak gstreamer gsettings jack libusb pw-cat raop sndfile v4l2 udev volume webrtc-echo-cancelling libcamera readline \
> > > +    ${FFMPEG_AVAILABLE} avahi flatpak gstreamer gsettings jack libusb pw-cat raop sndfile v4l2 udev volume webrtc-echo-cancelling readline \
> > >  "
> > >
> > >  # "jack" and "pipewire-jack" packageconfigs cannot be both enabled,
> > > --
> > > 2.39.2
> > >
> > >

Re: [libcamera-devel] [PATCH 19/20] libcamera: skip until upstream resolves python 3.12 compatibility

[Laurent Pinchart]

On Fri, Dec 15, 2023 at 01:04:02PM +0100, Alexander Kanavin via libcamera-devel wrote:
> That's right.
> 
> This page provides hints for how to replace usage of imp with
> equivalents in importlib:
> https://docs.python.org/3.11/library/imp.html

The trouble is that the code in libcamera that uses imp isn't ours, it's
copied as-is from a third-party project. If we're lucky they will have
fixed the issue, and we can just take the latest version.

> On Fri, 15 Dec 2023 at 11:18, Kieran Bingham wrote:
> > Quoting Kieran Bingham (2023-12-15 10:16:20)
> > > +libcamera-devel mailing list
> > >
> > > Quoting Alexander Kanavin (2023-12-15 07:52:38)
> > > > I'd note that imp module has been deprecated for years, so that's what
> > > > happens when deprecation warnings are ignored.

I haven't seen any warnings anywhere in the build process. Did I miss
them ?

> > > Can you tell me more about what this issue is please? I'm not aware of
> > > it at all.
> > >
> > > > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > > > ---
> > > >  meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb | 1 +
> > > >  .../packagegroups/packagegroup-meta-multimedia.bb               | 1 -
> > > >  meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb   | 2 +-
> > > >  3 files changed, 2 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb
> > > > index 2a3c6473e..9c04d7434 100644
> > > > --- a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb
> > > > +++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb
> > > > @@ -73,3 +73,4 @@ FILES:${PN}-gst = "${libdir}/gstreamer-1.0"
> > > >  # both 32 and 64 bit file APIs.
> > > >  GLIBC_64BIT_TIME_FLAGS = ""
> > > >
> > > > +SKIP_RECIPE[libcamera] ?= "Not compatible with python 3.12, see https://bugs.libcamera.org/show_bug.cgi?id=206"
> >
> > Aha, the clue was buried here.
> >
> > > > diff --git a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
> > > > index 672c8abc9..6ca4d539f 100644
> > > > --- a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
> > > > +++ b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
> > > > @@ -42,7 +42,6 @@ RDEPENDS:packagegroup-meta-multimedia = "\
> > > >      tearsofsteel-1080p \
> > > >      pipewire \
> > > >      ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains("DISTRO_FEATURES", "x11", "projucer", "", d), "", d)} \
> > > > -    libcamera \
> > > >      vorbis-tools \
> > > >      libopenmpt \
> > > >      mimic \
> > > > diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb
> > > > index b4da781f0..4d894349a 100644
> > > > --- a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb
> > > > +++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb
> > > > @@ -86,7 +86,7 @@ PACKAGECONFIG:class-target ??= " \
> > > >      ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-system-service systemd-user-service', '', d)} \
> > > >      ${@bb.utils.filter('DISTRO_FEATURES', 'alsa vulkan pulseaudio', d)} \
> > > >      ${PIPEWIRE_SESSION_MANAGER} \
> > > > -    ${FFMPEG_AVAILABLE} avahi flatpak gstreamer gsettings jack libusb pw-cat raop sndfile v4l2 udev volume webrtc-echo-cancelling libcamera readline \
> > > > +    ${FFMPEG_AVAILABLE} avahi flatpak gstreamer gsettings jack libusb pw-cat raop sndfile v4l2 udev volume webrtc-echo-cancelling readline \
> > > >  "
> > > >
> > > >  # "jack" and "pipewire-jack" packageconfigs cannot be both enabled,

-- 
Regards,

Laurent Pinchart

Re: [libcamera-devel] [PATCH 19/20] libcamera: skip until upstream resolves python 3.12 compatibility

[Mattijs Korpershoek]

Hi Laurent,

On ven., déc. 15, 2023 at 14:50, Laurent Pinchart via libcamera-devel <libcamera-devel@lists.libcamera.org> wrote:

> On Fri, Dec 15, 2023 at 01:04:02PM +0100, Alexander Kanavin via libcamera-devel wrote:
>> That's right.
>> 
>> This page provides hints for how to replace usage of imp with
>> equivalents in importlib:
>> https://docs.python.org/3.11/library/imp.html
>
> The trouble is that the code in libcamera that uses imp isn't ours, it's
> copied as-is from a third-party project. If we're lucky they will have
> fixed the issue, and we can just take the latest version.

If this is in mojo, seems that chromium fixed it:
https://chromium.googlesource.com/chromium/src/+/f5f6e361d037c31630661186e7bd7b31d2784cb8


>
>> On Fri, 15 Dec 2023 at 11:18, Kieran Bingham wrote:
>> > Quoting Kieran Bingham (2023-12-15 10:16:20)
>> > > +libcamera-devel mailing list
>> > >
>> > > Quoting Alexander Kanavin (2023-12-15 07:52:38)
>> > > > I'd note that imp module has been deprecated for years, so that's what
>> > > > happens when deprecation warnings are ignored.
>
> I haven't seen any warnings anywhere in the build process. Did I miss
> them ?
>
>> > > Can you tell me more about what this issue is please? I'm not aware of
>> > > it at all.
>> > >
>> > > > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
>> > > > ---
>> > > >  meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb | 1 +
>> > > >  .../packagegroups/packagegroup-meta-multimedia.bb               | 1 -
>> > > >  meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb   | 2 +-
>> > > >  3 files changed, 2 insertions(+), 2 deletions(-)
>> > > >
>> > > > diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb
>> > > > index 2a3c6473e..9c04d7434 100644
>> > > > --- a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb
>> > > > +++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb
>> > > > @@ -73,3 +73,4 @@ FILES:${PN}-gst = "${libdir}/gstreamer-1.0"
>> > > >  # both 32 and 64 bit file APIs.
>> > > >  GLIBC_64BIT_TIME_FLAGS = ""
>> > > >
>> > > > +SKIP_RECIPE[libcamera] ?= "Not compatible with python 3.12, see https://bugs.libcamera.org/show_bug.cgi?id=206"
>> >
>> > Aha, the clue was buried here.
>> >
>> > > > diff --git a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
>> > > > index 672c8abc9..6ca4d539f 100644
>> > > > --- a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
>> > > > +++ b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
>> > > > @@ -42,7 +42,6 @@ RDEPENDS:packagegroup-meta-multimedia = "\
>> > > >      tearsofsteel-1080p \
>> > > >      pipewire \
>> > > >      ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains("DISTRO_FEATURES", "x11", "projucer", "", d), "", d)} \
>> > > > -    libcamera \
>> > > >      vorbis-tools \
>> > > >      libopenmpt \
>> > > >      mimic \
>> > > > diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb
>> > > > index b4da781f0..4d894349a 100644
>> > > > --- a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb
>> > > > +++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb
>> > > > @@ -86,7 +86,7 @@ PACKAGECONFIG:class-target ??= " \
>> > > >      ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-system-service systemd-user-service', '', d)} \
>> > > >      ${@bb.utils.filter('DISTRO_FEATURES', 'alsa vulkan pulseaudio', d)} \
>> > > >      ${PIPEWIRE_SESSION_MANAGER} \
>> > > > -    ${FFMPEG_AVAILABLE} avahi flatpak gstreamer gsettings jack libusb pw-cat raop sndfile v4l2 udev volume webrtc-echo-cancelling libcamera readline \
>> > > > +    ${FFMPEG_AVAILABLE} avahi flatpak gstreamer gsettings jack libusb pw-cat raop sndfile v4l2 udev volume webrtc-echo-cancelling readline \
>> > > >  "
>> > > >
>> > > >  # "jack" and "pipewire-jack" packageconfigs cannot be both enabled,
>
> -- 
> Regards,
>
> Laurent Pinchart

Re: [libcamera-devel] [PATCH 19/20] libcamera: skip until upstream resolves python 3.12 compatibility

[Laurent Pinchart]

On Fri, Dec 15, 2023 at 02:21:53PM +0100, Mattijs Korpershoek wrote:
> On ven., déc. 15, 2023 at 14:50, Laurent Pinchart via libcamera-devel wrote:
> > On Fri, Dec 15, 2023 at 01:04:02PM +0100, Alexander Kanavin via libcamera-devel wrote:
> >> That's right.
> >> 
> >> This page provides hints for how to replace usage of imp with
> >> equivalents in importlib:
> >> https://docs.python.org/3.11/library/imp.html
> >
> > The trouble is that the code in libcamera that uses imp isn't ours, it's
> > copied as-is from a third-party project. If we're lucky they will have
> > fixed the issue, and we can just take the latest version.
> 
> If this is in mojo, seems that chromium fixed it:
> https://chromium.googlesource.com/chromium/src/+/f5f6e361d037c31630661186e7bd7b31d2784cb8

Nice :-) Looks like we have a (hopefully easy) path forward.

Thank you for checking.

> >> On Fri, 15 Dec 2023 at 11:18, Kieran Bingham wrote:
> >> > Quoting Kieran Bingham (2023-12-15 10:16:20)
> >> > > +libcamera-devel mailing list
> >> > >
> >> > > Quoting Alexander Kanavin (2023-12-15 07:52:38)
> >> > > > I'd note that imp module has been deprecated for years, so that's what
> >> > > > happens when deprecation warnings are ignored.
> >
> > I haven't seen any warnings anywhere in the build process. Did I miss
> > them ?
> >
> >> > > Can you tell me more about what this issue is please? I'm not aware of
> >> > > it at all.
> >> > >
> >> > > > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> >> > > > ---
> >> > > >  meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb | 1 +
> >> > > >  .../packagegroups/packagegroup-meta-multimedia.bb               | 1 -
> >> > > >  meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb   | 2 +-
> >> > > >  3 files changed, 2 insertions(+), 2 deletions(-)
> >> > > >
> >> > > > diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb
> >> > > > index 2a3c6473e..9c04d7434 100644
> >> > > > --- a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb
> >> > > > +++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb
> >> > > > @@ -73,3 +73,4 @@ FILES:${PN}-gst = "${libdir}/gstreamer-1.0"
> >> > > >  # both 32 and 64 bit file APIs.
> >> > > >  GLIBC_64BIT_TIME_FLAGS = ""
> >> > > >
> >> > > > +SKIP_RECIPE[libcamera] ?= "Not compatible with python 3.12, see https://bugs.libcamera.org/show_bug.cgi?id=206"
> >> >
> >> > Aha, the clue was buried here.
> >> >
> >> > > > diff --git a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
> >> > > > index 672c8abc9..6ca4d539f 100644
> >> > > > --- a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
> >> > > > +++ b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
> >> > > > @@ -42,7 +42,6 @@ RDEPENDS:packagegroup-meta-multimedia = "\
> >> > > >      tearsofsteel-1080p \
> >> > > >      pipewire \
> >> > > >      ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains("DISTRO_FEATURES", "x11", "projucer", "", d), "", d)} \
> >> > > > -    libcamera \
> >> > > >      vorbis-tools \
> >> > > >      libopenmpt \
> >> > > >      mimic \
> >> > > > diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb
> >> > > > index b4da781f0..4d894349a 100644
> >> > > > --- a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb
> >> > > > +++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb
> >> > > > @@ -86,7 +86,7 @@ PACKAGECONFIG:class-target ??= " \
> >> > > >      ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-system-service systemd-user-service', '', d)} \
> >> > > >      ${@bb.utils.filter('DISTRO_FEATURES', 'alsa vulkan pulseaudio', d)} \
> >> > > >      ${PIPEWIRE_SESSION_MANAGER} \
> >> > > > -    ${FFMPEG_AVAILABLE} avahi flatpak gstreamer gsettings jack libusb pw-cat raop sndfile v4l2 udev volume webrtc-echo-cancelling libcamera readline \
> >> > > > +    ${FFMPEG_AVAILABLE} avahi flatpak gstreamer gsettings jack libusb pw-cat raop sndfile v4l2 udev volume webrtc-echo-cancelling readline \
> >> > > >  "
> >> > > >
> >> > > >  # "jack" and "pipewire-jack" packageconfigs cannot be both enabled,

-- 
Regards,

Laurent Pinchart

[PATCH 20/20] nodejs: backport (partially) python 3.12 support

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...001-build-fix-build-with-Python-3.12.patch | 55 ++++++++++++++++
 .../0001-gyp-resolve-python-3.12-issues.patch | 63 +++++++++++++++++++
 .../recipes-devtools/nodejs/nodejs_20.8.1.bb  |  4 +-
 3 files changed, 121 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch
 create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch

diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch
new file mode 100644
index 000000000..39026d074
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch
@@ -0,0 +1,55 @@
+From 656f6c91f1da7f1e1ffb01e2de7d9026a84958b5 Mon Sep 17 00:00:00 2001
+From: Luigi Pinca <luigipinca@gmail.com>
+Date: Wed, 8 Nov 2023 21:20:53 +0100
+Subject: [PATCH] build: fix build with Python 3.12
+
+Replace `distutils.version.StrictVersion` with
+`packaging.version.Version`.
+
+Refs: https://github.com/nodejs/node/pull/50209#issuecomment-1795852539
+PR-URL: https://github.com/nodejs/node/pull/50582
+Reviewed-By: Richard Lau <rlau@redhat.com>
+Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
+
+Upstream-Status: Backport [https://github.com/nodejs/node/commit/95534ad82f4e33f53fd50efe633d43f8da70cba6]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ configure.py | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/configure.py b/configure.py
+index 62f041ce..18fe7c14 100755
+--- a/configure.py
++++ b/configure.py
+@@ -14,8 +14,6 @@ import bz2
+ import io
+ from pathlib import Path
+ 
+-from distutils.version import StrictVersion
+-
+ # If not run from node/, cd to node/.
+ os.chdir(Path(__file__).parent)
+ 
+@@ -30,6 +28,7 @@ tools_path = Path('tools')
+ 
+ sys.path.insert(0, str(tools_path / 'gyp' / 'pylib'))
+ from gyp.common import GetFlavor
++from packaging.version import Version
+ 
+ # imports in tools/configure.d
+ sys.path.insert(0, str(tools_path / 'configure.d'))
+@@ -1565,10 +1564,10 @@ def configure_openssl(o):
+     # supported asm compiler for AVX2. See https://github.com/openssl/openssl/
+     # blob/OpenSSL_1_1_0-stable/crypto/modes/asm/aesni-gcm-x86_64.pl#L52-L69
+     openssl110_asm_supported = \
+-      ('gas_version' in variables and StrictVersion(variables['gas_version']) >= StrictVersion('2.23')) or \
+-      ('xcode_version' in variables and StrictVersion(variables['xcode_version']) >= StrictVersion('5.0')) or \
+-      ('llvm_version' in variables and StrictVersion(variables['llvm_version']) >= StrictVersion('3.3')) or \
+-      ('nasm_version' in variables and StrictVersion(variables['nasm_version']) >= StrictVersion('2.10'))
++      ('gas_version' in variables and Version(variables['gas_version']) >= Version('2.23')) or \
++      ('xcode_version' in variables and Version(variables['xcode_version']) >= Version('5.0')) or \
++      ('llvm_version' in variables and Version(variables['llvm_version']) >= Version('3.3')) or \
++      ('nasm_version' in variables and Version(variables['nasm_version']) >= Version('2.10'))
+ 
+     if is_x86 and not openssl110_asm_supported:
+       error('''Did not find a new enough assembler, install one or build with
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch
new file mode 100644
index 000000000..9d878dfb8
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch
@@ -0,0 +1,63 @@
+From bf8c96ba6936050ed4a0de5bc8aeeaf2b3c50dc1 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Thu, 7 Dec 2023 12:54:30 +0100
+Subject: [PATCH] gyp: resolve python 3.12 issues
+
+Upstream has updated gyp wholesale in the main branch, so
+this patch can be dropped in due time.
+
+Upstream-Status: Inappropriate [issue will be fixed upstream with the next nodejs LTS update]
+
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py | 4 ++--
+ tools/gyp/pylib/gyp/input.py                          | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py
+index d9699a0a..173e9465 100644
+--- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py
++++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py
+@@ -16,7 +16,7 @@ import subprocess
+ import sys
+ import threading
+ import traceback
+-from distutils.version import StrictVersion
++from packaging.version import Version
+ from gyp.common import GypError
+ from gyp.common import OrderedSet
+ 
+@@ -1183,7 +1183,7 @@ def EvalSingleCondition(cond_expr, true_dict, false_dict, phase, variables, buil
+         else:
+             ast_code = compile(cond_expr_expanded, "<string>", "eval")
+             cached_conditions_asts[cond_expr_expanded] = ast_code
+-        env = {"__builtins__": {}, "v": StrictVersion}
++        env = {"__builtins__": {}, "v": Version}
+         if eval(ast_code, env, variables):
+             return true_dict
+         return false_dict
+diff --git a/tools/gyp/pylib/gyp/input.py b/tools/gyp/pylib/gyp/input.py
+index 354958bf..ab6112e5 100644
+--- a/tools/gyp/pylib/gyp/input.py
++++ b/tools/gyp/pylib/gyp/input.py
+@@ -16,7 +16,7 @@ import subprocess
+ import sys
+ import threading
+ import traceback
+-from distutils.version import StrictVersion
++from packaging.version import Version
+ from gyp.common import GypError
+ from gyp.common import OrderedSet
+ 
+@@ -1190,7 +1190,7 @@ def EvalSingleCondition(cond_expr, true_dict, false_dict, phase, variables, buil
+         else:
+             ast_code = compile(cond_expr_expanded, "<string>", "eval")
+             cached_conditions_asts[cond_expr_expanded] = ast_code
+-        env = {"__builtins__": {}, "v": StrictVersion}
++        env = {"__builtins__": {}, "v": Version}
+         if eval(ast_code, env, variables):
+             return true_dict
+         return false_dict
+-- 
+2.39.2
+
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_20.8.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_20.8.1.bb
index 65f4eb3f3..0ca0c1498 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_20.8.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_20.8.1.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=162595a4a2f3453a0534e60b0afe4e7b"
 
 CVE_PRODUCT = "nodejs node.js"
 
-DEPENDS = "openssl file-replacement-native"
+DEPENDS = "openssl file-replacement-native python3-packaging-native"
 DEPENDS:append:class-target = " qemu-native"
 DEPENDS:append:class-native = " c-ares-native"
 
@@ -27,6 +27,8 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
            file://0001-Revert-io_uring-changes-from-libuv-1.46.0.patch \
            file://0002-Revert-io_uring-changes-from-libuv-1.45.0.patch \
            file://run-ptest \
+           file://0001-build-fix-build-with-Python-3.12.patch \
+           file://0001-gyp-resolve-python-3.12-issues.patch \
            "
 
 SRC_URI:append:class-target = " \
-- 
2.39.2

Re: [oe] [PATCH 20/20] nodejs: backport (partially) python 3.12 support

[Khem Raj]

this is regressing some dependent recipe e.g. simpleiot which depends
on gyp from nodejs-native

https://github.com/YoeDistro/yoe-distro/actions/runs/7258317572/job/19834510249?pr=882

On Thu, Dec 14, 2023 at 11:53 PM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  ...001-build-fix-build-with-Python-3.12.patch | 55 ++++++++++++++++
>  .../0001-gyp-resolve-python-3.12-issues.patch | 63 +++++++++++++++++++
>  .../recipes-devtools/nodejs/nodejs_20.8.1.bb  |  4 +-
>  3 files changed, 121 insertions(+), 1 deletion(-)
>  create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch
>  create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch
>
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch
> new file mode 100644
> index 000000000..39026d074
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch
> @@ -0,0 +1,55 @@
> +From 656f6c91f1da7f1e1ffb01e2de7d9026a84958b5 Mon Sep 17 00:00:00 2001
> +From: Luigi Pinca <luigipinca@gmail.com>
> +Date: Wed, 8 Nov 2023 21:20:53 +0100
> +Subject: [PATCH] build: fix build with Python 3.12
> +
> +Replace `distutils.version.StrictVersion` with
> +`packaging.version.Version`.
> +
> +Refs: https://github.com/nodejs/node/pull/50209#issuecomment-1795852539
> +PR-URL: https://github.com/nodejs/node/pull/50582
> +Reviewed-By: Richard Lau <rlau@redhat.com>
> +Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
> +
> +Upstream-Status: Backport [https://github.com/nodejs/node/commit/95534ad82f4e33f53fd50efe633d43f8da70cba6]
> +Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> +---
> + configure.py | 11 +++++------
> + 1 file changed, 5 insertions(+), 6 deletions(-)
> +
> +diff --git a/configure.py b/configure.py
> +index 62f041ce..18fe7c14 100755
> +--- a/configure.py
> ++++ b/configure.py
> +@@ -14,8 +14,6 @@ import bz2
> + import io
> + from pathlib import Path
> +
> +-from distutils.version import StrictVersion
> +-
> + # If not run from node/, cd to node/.
> + os.chdir(Path(__file__).parent)
> +
> +@@ -30,6 +28,7 @@ tools_path = Path('tools')
> +
> + sys.path.insert(0, str(tools_path / 'gyp' / 'pylib'))
> + from gyp.common import GetFlavor
> ++from packaging.version import Version
> +
> + # imports in tools/configure.d
> + sys.path.insert(0, str(tools_path / 'configure.d'))
> +@@ -1565,10 +1564,10 @@ def configure_openssl(o):
> +     # supported asm compiler for AVX2. See https://github.com/openssl/openssl/
> +     # blob/OpenSSL_1_1_0-stable/crypto/modes/asm/aesni-gcm-x86_64.pl#L52-L69
> +     openssl110_asm_supported = \
> +-      ('gas_version' in variables and StrictVersion(variables['gas_version']) >= StrictVersion('2.23')) or \
> +-      ('xcode_version' in variables and StrictVersion(variables['xcode_version']) >= StrictVersion('5.0')) or \
> +-      ('llvm_version' in variables and StrictVersion(variables['llvm_version']) >= StrictVersion('3.3')) or \
> +-      ('nasm_version' in variables and StrictVersion(variables['nasm_version']) >= StrictVersion('2.10'))
> ++      ('gas_version' in variables and Version(variables['gas_version']) >= Version('2.23')) or \
> ++      ('xcode_version' in variables and Version(variables['xcode_version']) >= Version('5.0')) or \
> ++      ('llvm_version' in variables and Version(variables['llvm_version']) >= Version('3.3')) or \
> ++      ('nasm_version' in variables and Version(variables['nasm_version']) >= Version('2.10'))
> +
> +     if is_x86 and not openssl110_asm_supported:
> +       error('''Did not find a new enough assembler, install one or build with
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch
> new file mode 100644
> index 000000000..9d878dfb8
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch
> @@ -0,0 +1,63 @@
> +From bf8c96ba6936050ed4a0de5bc8aeeaf2b3c50dc1 Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex@linutronix.de>
> +Date: Thu, 7 Dec 2023 12:54:30 +0100
> +Subject: [PATCH] gyp: resolve python 3.12 issues
> +
> +Upstream has updated gyp wholesale in the main branch, so
> +this patch can be dropped in due time.
> +
> +Upstream-Status: Inappropriate [issue will be fixed upstream with the next nodejs LTS update]
> +
> +Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> +---
> + deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py | 4 ++--
> + tools/gyp/pylib/gyp/input.py                          | 4 ++--
> + 2 files changed, 4 insertions(+), 4 deletions(-)
> +
> +diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py
> +index d9699a0a..173e9465 100644
> +--- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py
> ++++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py
> +@@ -16,7 +16,7 @@ import subprocess
> + import sys
> + import threading
> + import traceback
> +-from distutils.version import StrictVersion
> ++from packaging.version import Version
> + from gyp.common import GypError
> + from gyp.common import OrderedSet
> +
> +@@ -1183,7 +1183,7 @@ def EvalSingleCondition(cond_expr, true_dict, false_dict, phase, variables, buil
> +         else:
> +             ast_code = compile(cond_expr_expanded, "<string>", "eval")
> +             cached_conditions_asts[cond_expr_expanded] = ast_code
> +-        env = {"__builtins__": {}, "v": StrictVersion}
> ++        env = {"__builtins__": {}, "v": Version}
> +         if eval(ast_code, env, variables):
> +             return true_dict
> +         return false_dict
> +diff --git a/tools/gyp/pylib/gyp/input.py b/tools/gyp/pylib/gyp/input.py
> +index 354958bf..ab6112e5 100644
> +--- a/tools/gyp/pylib/gyp/input.py
> ++++ b/tools/gyp/pylib/gyp/input.py
> +@@ -16,7 +16,7 @@ import subprocess
> + import sys
> + import threading
> + import traceback
> +-from distutils.version import StrictVersion
> ++from packaging.version import Version
> + from gyp.common import GypError
> + from gyp.common import OrderedSet
> +
> +@@ -1190,7 +1190,7 @@ def EvalSingleCondition(cond_expr, true_dict, false_dict, phase, variables, buil
> +         else:
> +             ast_code = compile(cond_expr_expanded, "<string>", "eval")
> +             cached_conditions_asts[cond_expr_expanded] = ast_code
> +-        env = {"__builtins__": {}, "v": StrictVersion}
> ++        env = {"__builtins__": {}, "v": Version}
> +         if eval(ast_code, env, variables):
> +             return true_dict
> +         return false_dict
> +--
> +2.39.2
> +
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_20.8.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_20.8.1.bb
> index 65f4eb3f3..0ca0c1498 100644
> --- a/meta-oe/recipes-devtools/nodejs/nodejs_20.8.1.bb
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs_20.8.1.bb
> @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=162595a4a2f3453a0534e60b0afe4e7b"
>
>  CVE_PRODUCT = "nodejs node.js"
>
> -DEPENDS = "openssl file-replacement-native"
> +DEPENDS = "openssl file-replacement-native python3-packaging-native"
>  DEPENDS:append:class-target = " qemu-native"
>  DEPENDS:append:class-native = " c-ares-native"
>
> @@ -27,6 +27,8 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
>             file://0001-Revert-io_uring-changes-from-libuv-1.46.0.patch \
>             file://0002-Revert-io_uring-changes-from-libuv-1.45.0.patch \
>             file://run-ptest \
> +           file://0001-build-fix-build-with-Python-3.12.patch \
> +           file://0001-gyp-resolve-python-3.12-issues.patch \
>             "
>
>  SRC_URI:append:class-target = " \
> --
> 2.39.2
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#107513): https://lists.openembedded.org/g/openembedded-devel/message/107513
> Mute This Topic: https://lists.openembedded.org/mt/103186676/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Re: [oe] [PATCH 20/20] nodejs: backport (partially) python 3.12 support

[Alexander Kanavin]

| npm ERR! ModuleNotFoundError: No module named 'packaging'

Looks like python3-packaging needs to be in RDEPENDS as well, I'll
make a fix (or you can quickly try to see if it resolves the error).

Alex

On Wed, 20 Dec 2023 at 20:12, Khem Raj <raj.khem@gmail.com> wrote:
>
> this is regressing some dependent recipe e.g. simpleiot which depends
> on gyp from nodejs-native
>
> https://github.com/YoeDistro/yoe-distro/actions/runs/7258317572/job/19834510249?pr=882
>
> On Thu, Dec 14, 2023 at 11:53 PM Alexander Kanavin
> <alex.kanavin@gmail.com> wrote:
> >
> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > ---
> >  ...001-build-fix-build-with-Python-3.12.patch | 55 ++++++++++++++++
> >  .../0001-gyp-resolve-python-3.12-issues.patch | 63 +++++++++++++++++++
> >  .../recipes-devtools/nodejs/nodejs_20.8.1.bb  |  4 +-
> >  3 files changed, 121 insertions(+), 1 deletion(-)
> >  create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch
> >  create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch
> >
> > diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch
> > new file mode 100644
> > index 000000000..39026d074
> > --- /dev/null
> > +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch
> > @@ -0,0 +1,55 @@
> > +From 656f6c91f1da7f1e1ffb01e2de7d9026a84958b5 Mon Sep 17 00:00:00 2001
> > +From: Luigi Pinca <luigipinca@gmail.com>
> > +Date: Wed, 8 Nov 2023 21:20:53 +0100
> > +Subject: [PATCH] build: fix build with Python 3.12
> > +
> > +Replace `distutils.version.StrictVersion` with
> > +`packaging.version.Version`.
> > +
> > +Refs: https://github.com/nodejs/node/pull/50209#issuecomment-1795852539
> > +PR-URL: https://github.com/nodejs/node/pull/50582
> > +Reviewed-By: Richard Lau <rlau@redhat.com>
> > +Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
> > +
> > +Upstream-Status: Backport [https://github.com/nodejs/node/commit/95534ad82f4e33f53fd50efe633d43f8da70cba6]
> > +Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > +---
> > + configure.py | 11 +++++------
> > + 1 file changed, 5 insertions(+), 6 deletions(-)
> > +
> > +diff --git a/configure.py b/configure.py
> > +index 62f041ce..18fe7c14 100755
> > +--- a/configure.py
> > ++++ b/configure.py
> > +@@ -14,8 +14,6 @@ import bz2
> > + import io
> > + from pathlib import Path
> > +
> > +-from distutils.version import StrictVersion
> > +-
> > + # If not run from node/, cd to node/.
> > + os.chdir(Path(__file__).parent)
> > +
> > +@@ -30,6 +28,7 @@ tools_path = Path('tools')
> > +
> > + sys.path.insert(0, str(tools_path / 'gyp' / 'pylib'))
> > + from gyp.common import GetFlavor
> > ++from packaging.version import Version
> > +
> > + # imports in tools/configure.d
> > + sys.path.insert(0, str(tools_path / 'configure.d'))
> > +@@ -1565,10 +1564,10 @@ def configure_openssl(o):
> > +     # supported asm compiler for AVX2. See https://github.com/openssl/openssl/
> > +     # blob/OpenSSL_1_1_0-stable/crypto/modes/asm/aesni-gcm-x86_64.pl#L52-L69
> > +     openssl110_asm_supported = \
> > +-      ('gas_version' in variables and StrictVersion(variables['gas_version']) >= StrictVersion('2.23')) or \
> > +-      ('xcode_version' in variables and StrictVersion(variables['xcode_version']) >= StrictVersion('5.0')) or \
> > +-      ('llvm_version' in variables and StrictVersion(variables['llvm_version']) >= StrictVersion('3.3')) or \
> > +-      ('nasm_version' in variables and StrictVersion(variables['nasm_version']) >= StrictVersion('2.10'))
> > ++      ('gas_version' in variables and Version(variables['gas_version']) >= Version('2.23')) or \
> > ++      ('xcode_version' in variables and Version(variables['xcode_version']) >= Version('5.0')) or \
> > ++      ('llvm_version' in variables and Version(variables['llvm_version']) >= Version('3.3')) or \
> > ++      ('nasm_version' in variables and Version(variables['nasm_version']) >= Version('2.10'))
> > +
> > +     if is_x86 and not openssl110_asm_supported:
> > +       error('''Did not find a new enough assembler, install one or build with
> > diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch
> > new file mode 100644
> > index 000000000..9d878dfb8
> > --- /dev/null
> > +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch
> > @@ -0,0 +1,63 @@
> > +From bf8c96ba6936050ed4a0de5bc8aeeaf2b3c50dc1 Mon Sep 17 00:00:00 2001
> > +From: Alexander Kanavin <alex@linutronix.de>
> > +Date: Thu, 7 Dec 2023 12:54:30 +0100
> > +Subject: [PATCH] gyp: resolve python 3.12 issues
> > +
> > +Upstream has updated gyp wholesale in the main branch, so
> > +this patch can be dropped in due time.
> > +
> > +Upstream-Status: Inappropriate [issue will be fixed upstream with the next nodejs LTS update]
> > +
> > +Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > +---
> > + deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py | 4 ++--
> > + tools/gyp/pylib/gyp/input.py                          | 4 ++--
> > + 2 files changed, 4 insertions(+), 4 deletions(-)
> > +
> > +diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py
> > +index d9699a0a..173e9465 100644
> > +--- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py
> > ++++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py
> > +@@ -16,7 +16,7 @@ import subprocess
> > + import sys
> > + import threading
> > + import traceback
> > +-from distutils.version import StrictVersion
> > ++from packaging.version import Version
> > + from gyp.common import GypError
> > + from gyp.common import OrderedSet
> > +
> > +@@ -1183,7 +1183,7 @@ def EvalSingleCondition(cond_expr, true_dict, false_dict, phase, variables, buil
> > +         else:
> > +             ast_code = compile(cond_expr_expanded, "<string>", "eval")
> > +             cached_conditions_asts[cond_expr_expanded] = ast_code
> > +-        env = {"__builtins__": {}, "v": StrictVersion}
> > ++        env = {"__builtins__": {}, "v": Version}
> > +         if eval(ast_code, env, variables):
> > +             return true_dict
> > +         return false_dict
> > +diff --git a/tools/gyp/pylib/gyp/input.py b/tools/gyp/pylib/gyp/input.py
> > +index 354958bf..ab6112e5 100644
> > +--- a/tools/gyp/pylib/gyp/input.py
> > ++++ b/tools/gyp/pylib/gyp/input.py
> > +@@ -16,7 +16,7 @@ import subprocess
> > + import sys
> > + import threading
> > + import traceback
> > +-from distutils.version import StrictVersion
> > ++from packaging.version import Version
> > + from gyp.common import GypError
> > + from gyp.common import OrderedSet
> > +
> > +@@ -1190,7 +1190,7 @@ def EvalSingleCondition(cond_expr, true_dict, false_dict, phase, variables, buil
> > +         else:
> > +             ast_code = compile(cond_expr_expanded, "<string>", "eval")
> > +             cached_conditions_asts[cond_expr_expanded] = ast_code
> > +-        env = {"__builtins__": {}, "v": StrictVersion}
> > ++        env = {"__builtins__": {}, "v": Version}
> > +         if eval(ast_code, env, variables):
> > +             return true_dict
> > +         return false_dict
> > +--
> > +2.39.2
> > +
> > diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_20.8.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_20.8.1.bb
> > index 65f4eb3f3..0ca0c1498 100644
> > --- a/meta-oe/recipes-devtools/nodejs/nodejs_20.8.1.bb
> > +++ b/meta-oe/recipes-devtools/nodejs/nodejs_20.8.1.bb
> > @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=162595a4a2f3453a0534e60b0afe4e7b"
> >
> >  CVE_PRODUCT = "nodejs node.js"
> >
> > -DEPENDS = "openssl file-replacement-native"
> > +DEPENDS = "openssl file-replacement-native python3-packaging-native"
> >  DEPENDS:append:class-target = " qemu-native"
> >  DEPENDS:append:class-native = " c-ares-native"
> >
> > @@ -27,6 +27,8 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
> >             file://0001-Revert-io_uring-changes-from-libuv-1.46.0.patch \
> >             file://0002-Revert-io_uring-changes-from-libuv-1.45.0.patch \
> >             file://run-ptest \
> > +           file://0001-build-fix-build-with-Python-3.12.patch \
> > +           file://0001-gyp-resolve-python-3.12-issues.patch \
> >             "
> >
> >  SRC_URI:append:class-target = " \
> > --
> > 2.39.2
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#107513): https://lists.openembedded.org/g/openembedded-devel/message/107513
> > Mute This Topic: https://lists.openembedded.org/mt/103186676/1997914
> > Group Owner: openembedded-devel+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >

Re: [oe] [PATCH 20/20] nodejs: backport (partially) python 3.12 support

[Khem Raj]

I fixed it with
https://github.com/YoeDistro/yoe-distro/pull/882/commits/359ac8dbaef7e531143b9ad48e1a7d8824efa6f6

On Wed, Dec 20, 2023 at 12:45 PM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> | npm ERR! ModuleNotFoundError: No module named 'packaging'
>
> Looks like python3-packaging needs to be in RDEPENDS as well, I'll
> make a fix (or you can quickly try to see if it resolves the error).
>
> Alex
>
> On Wed, 20 Dec 2023 at 20:12, Khem Raj <raj.khem@gmail.com> wrote:
> >
> > this is regressing some dependent recipe e.g. simpleiot which depends
> > on gyp from nodejs-native
> >
> > https://github.com/YoeDistro/yoe-distro/actions/runs/7258317572/job/19834510249?pr=882
> >
> > On Thu, Dec 14, 2023 at 11:53 PM Alexander Kanavin
> > <alex.kanavin@gmail.com> wrote:
> > >
> > > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > > ---
> > >  ...001-build-fix-build-with-Python-3.12.patch | 55 ++++++++++++++++
> > >  .../0001-gyp-resolve-python-3.12-issues.patch | 63 +++++++++++++++++++
> > >  .../recipes-devtools/nodejs/nodejs_20.8.1.bb  |  4 +-
> > >  3 files changed, 121 insertions(+), 1 deletion(-)
> > >  create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch
> > >  create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch
> > >
> > > diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch
> > > new file mode 100644
> > > index 000000000..39026d074
> > > --- /dev/null
> > > +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch
> > > @@ -0,0 +1,55 @@
> > > +From 656f6c91f1da7f1e1ffb01e2de7d9026a84958b5 Mon Sep 17 00:00:00 2001
> > > +From: Luigi Pinca <luigipinca@gmail.com>
> > > +Date: Wed, 8 Nov 2023 21:20:53 +0100
> > > +Subject: [PATCH] build: fix build with Python 3.12
> > > +
> > > +Replace `distutils.version.StrictVersion` with
> > > +`packaging.version.Version`.
> > > +
> > > +Refs: https://github.com/nodejs/node/pull/50209#issuecomment-1795852539
> > > +PR-URL: https://github.com/nodejs/node/pull/50582
> > > +Reviewed-By: Richard Lau <rlau@redhat.com>
> > > +Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
> > > +
> > > +Upstream-Status: Backport [https://github.com/nodejs/node/commit/95534ad82f4e33f53fd50efe633d43f8da70cba6]
> > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > > +---
> > > + configure.py | 11 +++++------
> > > + 1 file changed, 5 insertions(+), 6 deletions(-)
> > > +
> > > +diff --git a/configure.py b/configure.py
> > > +index 62f041ce..18fe7c14 100755
> > > +--- a/configure.py
> > > ++++ b/configure.py
> > > +@@ -14,8 +14,6 @@ import bz2
> > > + import io
> > > + from pathlib import Path
> > > +
> > > +-from distutils.version import StrictVersion
> > > +-
> > > + # If not run from node/, cd to node/.
> > > + os.chdir(Path(__file__).parent)
> > > +
> > > +@@ -30,6 +28,7 @@ tools_path = Path('tools')
> > > +
> > > + sys.path.insert(0, str(tools_path / 'gyp' / 'pylib'))
> > > + from gyp.common import GetFlavor
> > > ++from packaging.version import Version
> > > +
> > > + # imports in tools/configure.d
> > > + sys.path.insert(0, str(tools_path / 'configure.d'))
> > > +@@ -1565,10 +1564,10 @@ def configure_openssl(o):
> > > +     # supported asm compiler for AVX2. See https://github.com/openssl/openssl/
> > > +     # blob/OpenSSL_1_1_0-stable/crypto/modes/asm/aesni-gcm-x86_64.pl#L52-L69
> > > +     openssl110_asm_supported = \
> > > +-      ('gas_version' in variables and StrictVersion(variables['gas_version']) >= StrictVersion('2.23')) or \
> > > +-      ('xcode_version' in variables and StrictVersion(variables['xcode_version']) >= StrictVersion('5.0')) or \
> > > +-      ('llvm_version' in variables and StrictVersion(variables['llvm_version']) >= StrictVersion('3.3')) or \
> > > +-      ('nasm_version' in variables and StrictVersion(variables['nasm_version']) >= StrictVersion('2.10'))
> > > ++      ('gas_version' in variables and Version(variables['gas_version']) >= Version('2.23')) or \
> > > ++      ('xcode_version' in variables and Version(variables['xcode_version']) >= Version('5.0')) or \
> > > ++      ('llvm_version' in variables and Version(variables['llvm_version']) >= Version('3.3')) or \
> > > ++      ('nasm_version' in variables and Version(variables['nasm_version']) >= Version('2.10'))
> > > +
> > > +     if is_x86 and not openssl110_asm_supported:
> > > +       error('''Did not find a new enough assembler, install one or build with
> > > diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch
> > > new file mode 100644
> > > index 000000000..9d878dfb8
> > > --- /dev/null
> > > +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch
> > > @@ -0,0 +1,63 @@
> > > +From bf8c96ba6936050ed4a0de5bc8aeeaf2b3c50dc1 Mon Sep 17 00:00:00 2001
> > > +From: Alexander Kanavin <alex@linutronix.de>
> > > +Date: Thu, 7 Dec 2023 12:54:30 +0100
> > > +Subject: [PATCH] gyp: resolve python 3.12 issues
> > > +
> > > +Upstream has updated gyp wholesale in the main branch, so
> > > +this patch can be dropped in due time.
> > > +
> > > +Upstream-Status: Inappropriate [issue will be fixed upstream with the next nodejs LTS update]
> > > +
> > > +Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > > +---
> > > + deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py | 4 ++--
> > > + tools/gyp/pylib/gyp/input.py                          | 4 ++--
> > > + 2 files changed, 4 insertions(+), 4 deletions(-)
> > > +
> > > +diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py
> > > +index d9699a0a..173e9465 100644
> > > +--- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py
> > > ++++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py
> > > +@@ -16,7 +16,7 @@ import subprocess
> > > + import sys
> > > + import threading
> > > + import traceback
> > > +-from distutils.version import StrictVersion
> > > ++from packaging.version import Version
> > > + from gyp.common import GypError
> > > + from gyp.common import OrderedSet
> > > +
> > > +@@ -1183,7 +1183,7 @@ def EvalSingleCondition(cond_expr, true_dict, false_dict, phase, variables, buil
> > > +         else:
> > > +             ast_code = compile(cond_expr_expanded, "<string>", "eval")
> > > +             cached_conditions_asts[cond_expr_expanded] = ast_code
> > > +-        env = {"__builtins__": {}, "v": StrictVersion}
> > > ++        env = {"__builtins__": {}, "v": Version}
> > > +         if eval(ast_code, env, variables):
> > > +             return true_dict
> > > +         return false_dict
> > > +diff --git a/tools/gyp/pylib/gyp/input.py b/tools/gyp/pylib/gyp/input.py
> > > +index 354958bf..ab6112e5 100644
> > > +--- a/tools/gyp/pylib/gyp/input.py
> > > ++++ b/tools/gyp/pylib/gyp/input.py
> > > +@@ -16,7 +16,7 @@ import subprocess
> > > + import sys
> > > + import threading
> > > + import traceback
> > > +-from distutils.version import StrictVersion
> > > ++from packaging.version import Version
> > > + from gyp.common import GypError
> > > + from gyp.common import OrderedSet
> > > +
> > > +@@ -1190,7 +1190,7 @@ def EvalSingleCondition(cond_expr, true_dict, false_dict, phase, variables, buil
> > > +         else:
> > > +             ast_code = compile(cond_expr_expanded, "<string>", "eval")
> > > +             cached_conditions_asts[cond_expr_expanded] = ast_code
> > > +-        env = {"__builtins__": {}, "v": StrictVersion}
> > > ++        env = {"__builtins__": {}, "v": Version}
> > > +         if eval(ast_code, env, variables):
> > > +             return true_dict
> > > +         return false_dict
> > > +--
> > > +2.39.2
> > > +
> > > diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_20.8.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_20.8.1.bb
> > > index 65f4eb3f3..0ca0c1498 100644
> > > --- a/meta-oe/recipes-devtools/nodejs/nodejs_20.8.1.bb
> > > +++ b/meta-oe/recipes-devtools/nodejs/nodejs_20.8.1.bb
> > > @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=162595a4a2f3453a0534e60b0afe4e7b"
> > >
> > >  CVE_PRODUCT = "nodejs node.js"
> > >
> > > -DEPENDS = "openssl file-replacement-native"
> > > +DEPENDS = "openssl file-replacement-native python3-packaging-native"
> > >  DEPENDS:append:class-target = " qemu-native"
> > >  DEPENDS:append:class-native = " c-ares-native"
> > >
> > > @@ -27,6 +27,8 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
> > >             file://0001-Revert-io_uring-changes-from-libuv-1.46.0.patch \
> > >             file://0002-Revert-io_uring-changes-from-libuv-1.45.0.patch \
> > >             file://run-ptest \
> > > +           file://0001-build-fix-build-with-Python-3.12.patch \
> > > +           file://0001-gyp-resolve-python-3.12-issues.patch \
> > >             "
> > >
> > >  SRC_URI:append:class-target = " \
> > > --
> > > 2.39.2
> > >
> > >
> > > -=-=-=-=-=-=-=-=-=-=-=-
> > > Links: You receive all messages sent to this group.
> > > View/Reply Online (#107513): https://lists.openembedded.org/g/openembedded-devel/message/107513
> > > Mute This Topic: https://lists.openembedded.org/mt/103186676/1997914
> > > Group Owner: openembedded-devel+owner@lists.openembedded.org
> > > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> > > -=-=-=-=-=-=-=-=-=-=-=-
> > >