[PATCH 01/23] fontforge: add a readline PACKAGECONFIG

[PATCH 01/23] fontforge: add a readline PACKAGECONFIG

[Alexander Kanavin]

This helps with build determinism; also if readline is not in sysroot
but readline-native is, fontforge erroneously decides to build with it.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb b/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb
index 404e86b86..31dd495fd 100644
--- a/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb
+++ b/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb
@@ -24,6 +24,8 @@ SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https \
 S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE = "-DENABLE_DOCS=OFF"
+PACKAGECONFIG = "readline"
+PACKAGECONFIG[readline] = "-DENABLE_READLINE=ON,-DENABLE_READLINE=OFF,readline"
 
 CFLAGS += "-fno-strict-aliasing"
 LDFLAGS += "-lpython${PYTHON_BASEVERSION}${PYTHON_ABI}"
-- 
2.39.2

[PATCH 02/23] volume-key: disable python bindings

[Alexander Kanavin]

No longer compatible with python 3.12; there hasn't been a release since 2018:
https://pagure.io/volume_key/releases

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb b/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb
index aff555ad5..cc03ab4fe 100644
--- a/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb
+++ b/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb
@@ -27,7 +27,7 @@ DEPENDS += " \
     swig-native \
 "
 
-PACKAGECONFIG ??= "python3"
+PACKAGECONFIG ??= ""
 PACKAGECONFIG[python3] = "--with-python3,--without-python3,python3,python3"
 
 EXTRA_OECONF = "--without-python"
-- 
2.39.2

[PATCH 03/23] audit: disable python bindings as incompatible with python 3.12

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta-oe/recipes-security/audit/audit_3.1.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-security/audit/audit_3.1.2.bb b/meta-oe/recipes-security/audit/audit_3.1.2.bb
index 5380e9022..1f2c821f0 100644
--- a/meta-oe/recipes-security/audit/audit_3.1.2.bb
+++ b/meta-oe/recipes-security/audit/audit_3.1.2.bb
@@ -32,7 +32,7 @@ DEPENDS = "python3 tcp-wrappers libcap-ng linux-libc-headers swig-native"
 EXTRA_OECONF = " --with-libwrap \
         --enable-gssapi-krb5=no \
         --with-libcap-ng=yes \
-        --with-python3=yes \
+        --with-python3=no \
         --libdir=${base_libdir} \
         --sbindir=${base_sbindir} \
         --without-python \
-- 
2.39.2

Re: [oe] [PATCH 03/23] audit: disable python bindings as incompatible with python 3.12

[Khem Raj]

On Sun, Dec 31, 2023 at 4:23 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  meta-oe/recipes-security/audit/audit_3.1.2.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta-oe/recipes-security/audit/audit_3.1.2.bb b/meta-oe/recipes-security/audit/audit_3.1.2.bb
> index 5380e9022..1f2c821f0 100644
> --- a/meta-oe/recipes-security/audit/audit_3.1.2.bb
> +++ b/meta-oe/recipes-security/audit/audit_3.1.2.bb
> @@ -32,7 +32,7 @@ DEPENDS = "python3 tcp-wrappers libcap-ng linux-libc-headers swig-native"
>  EXTRA_OECONF = " --with-libwrap \
>          --enable-gssapi-krb5=no \
>          --with-libcap-ng=yes \
> -        --with-python3=yes \
> +        --with-python3=no \

Can you share how it fails?

>          --libdir=${base_libdir} \
>          --sbindir=${base_sbindir} \
>          --without-python \
> --
> 2.39.2
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#107954): https://lists.openembedded.org/g/openembedded-devel/message/107954
> Mute This Topic: https://lists.openembedded.org/mt/103445559/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 03/23] audit: disable python bindings as incompatible with python 3.12

[Alexander Kanavin]

On Sun, 31 Dec 2023 at 18:04, Khem Raj <raj.khem@gmail.com> wrote:
>
> On Sun, Dec 31, 2023 at 4:23 AM Alexander Kanavin
> <alex.kanavin@gmail.com> wrote:
> >
> > Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> > ---
> >  meta-oe/recipes-security/audit/audit_3.1.2.bb | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta-oe/recipes-security/audit/audit_3.1.2.bb b/meta-oe/recipes-security/audit/audit_3.1.2.bb
> > index 5380e9022..1f2c821f0 100644
> > --- a/meta-oe/recipes-security/audit/audit_3.1.2.bb
> > +++ b/meta-oe/recipes-security/audit/audit_3.1.2.bb
> > @@ -32,7 +32,7 @@ DEPENDS = "python3 tcp-wrappers libcap-ng linux-libc-headers swig-native"
> >  EXTRA_OECONF = " --with-libwrap \
> >          --enable-gssapi-krb5=no \
> >          --with-libcap-ng=yes \
> > -        --with-python3=yes \
> > +        --with-python3=no \
>
> Can you share how it fails?

| make[4]: Entering directory
'/srv/storage/alex/yocto/build-64-alt/tmp/work/core2-64-poky-linux/audit/3.1.2/build/bindings/python/python3'
| /bin/bash ../../../libtool  --tag=CC   --mode=link
x86_64-poky-linux-gcc  -m64 -march=core2 -mtune=core2 -msse3
-mfpmath=sse -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2
-Wformat -Wformat-security -Werror=format-security
--sysroot=/srv/storage/alex/yocto/build-64-alt/tmp/work/core2-64-poky-linux/audit/3.1.2/recipe-sysroot
-shared -O2 -pipe -g -feliminate-unused-debug-types -fcanon-prefix-map
 -fmacro-prefix-map=/srv/storage/alex/yocto/build-64-alt/tmp/work/core2-64-poky-linux/audit/3.1.2/git=/usr/src/debug/audit/3.1.2
 -fdebug-prefix-map=/srv/storage/alex/yocto/build-64-alt/tmp/work/core2-64-poky-linux/audit/3.1.2/git=/usr/src/debug/audit/3.1.2
 -fmacro-prefix-map=/srv/storage/alex/yocto/build-64-alt/tmp/work/core2-64-poky-linux/audit/3.1.2/build=/usr/src/debug/audit/3.1.2
 -fdebug-prefix-map=/srv/storage/alex/yocto/build-64-alt/tmp/work/core2-64-poky-linux/audit/3.1.2/build=/usr/src/debug/audit/3.1.2
 -fdebug-prefix-map=/srv/storage/alex/yocto/build-64-alt/tmp/work/core2-64-poky-linux/audit/3.1.2/recipe-sysroot=
 -fmacro-prefix-map=/srv/storage/alex/yocto/build-64-alt/tmp/work/core2-64-poky-linux/audit/3.1.2/recipe-sysroot=
 -fdebug-prefix-map=/srv/storage/alex/yocto/build-64-alt/tmp/work/core2-64-poky-linux/audit/3.1.2/recipe-sysroot-native=
 -module -avoid-version -Wl,-z,relro -Wl,-O1 -Wl,--hash-style=gnu
-Wl,--as-needed -fcanon-prefix-map
-fmacro-prefix-map=/srv/storage/alex/yocto/build-64-alt/tmp/work/core2-64-poky-linux/audit/3.1.2/git=/usr/src/debug/audit/3.1.2
 -fdebug-prefix-map=/srv/storage/alex/yocto/build-64-alt/tmp/work/core2-64-poky-linux/audit/3.1.2/git=/usr/src/debug/audit/3.1.2
 -fmacro-prefix-map=/srv/storage/alex/yocto/build-64-alt/tmp/work/core2-64-poky-linux/audit/3.1.2/build=/usr/src/debug/audit/3.1.2
 -fdebug-prefix-map=/srv/storage/alex/yocto/build-64-alt/tmp/work/core2-64-poky-linux/audit/3.1.2/build=/usr/src/debug/audit/3.1.2
 -fdebug-prefix-map=/srv/storage/alex/yocto/build-64-alt/tmp/work/core2-64-poky-linux/audit/3.1.2/recipe-sysroot=
 -fmacro-prefix-map=/srv/storage/alex/yocto/build-64-alt/tmp/work/core2-64-poky-linux/audit/3.1.2/recipe-sysroot=
 -fdebug-prefix-map=/srv/storage/alex/yocto/build-64-alt/tmp/work/core2-64-poky-linux/audit/3.1.2/recipe-sysroot-native=
 -Wl,-z,relro,-z,now -o auparse.la -rpath
auparse_la-auparse_python.lo ../../../auparse/libauparse.la
../../../lib/libaudit.la
| libtool:   error: only absolute run-paths are allowed

This is due to lack of distutils in 3.12 and poorly written defaults
in autotools macros, which can be resolved via setuptools dependency;
I'll send a replacement patch in a moment.

Alex

[PATCH 04/23] cmpi-bindings: update 1.0.1 -> 1.0.4

[Alexander Kanavin]

Drop several obsolete patches; either upstream fixed the issue or
there's a standard way to cross-build python items.

Add setuptools dependency as distutils is still needed.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...BI-suffix-to-the-python-library-name.patch | 22 ----------
 .../cmpi-bindings/0001-Fix-error.patch        | 12 ++----
 .../cmpi-bindings/0001-Modify-cmakelist.patch | 41 -------------------
 ...-fix-the-build-error-when-python-3.0.patch | 33 ---------------
 .../cmpi-bindings-0.4.17-no-ruby-perl.patch   | 14 +++----
 .../cmpi-bindings-0.4.17-sblim-sigsegv.patch  | 18 +++++---
 .../cmpi-bindings-0.9.5-python-lib-dir.patch  | 17 --------
 ...ndings_1.0.1.bb => cmpi-bindings_1.0.4.bb} | 22 ++++------
 8 files changed, 30 insertions(+), 149 deletions(-)
 delete mode 100644 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch
 delete mode 100644 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Modify-cmakelist.patch
 delete mode 100644 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-the-build-error-when-python-3.0.patch
 delete mode 100644 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.9.5-python-lib-dir.patch
 rename meta-oe/recipes-extended/cmpi-bindings/{cmpi-bindings_1.0.1.bb => cmpi-bindings_1.0.4.bb} (61%)

diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch
deleted file mode 100644
index fa029da2b..000000000
--- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From a701ed30ac1bc2f77d063c237d6ae040a2d53f6b Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Mon, 16 May 2016 16:52:24 +0300
-Subject: [PATCH] Add 'm' suffix to the python library name.
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- swig/python/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/swig/python/CMakeLists.txt
-+++ b/swig/python/CMakeLists.txt
-@@ -49,7 +49,7 @@ ADD_DEFINITIONS(-DCMPI_PLATFORM_LINUX_GE
- SET( NAME pyCmpiProvider )
- ADD_LIBRARY( ${NAME} SHARED ${SWIG_OUTPUT})
- #TARGET_LINK_LIBRARIES( ${NAME} ${PYTHON_LIBRARIES} )
--TARGET_LINK_LIBRARIES( ${NAME} python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION} )
-+TARGET_LINK_LIBRARIES( ${NAME} python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION}${PYTHON_ABI} )
- TARGET_LINK_LIBRARIES( ${NAME} pthread )
- TARGET_LINK_LIBRARIES( ${NAME} dl )
- TARGET_LINK_LIBRARIES( ${NAME} util )
diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch
index 1d8013be6..1f147d52f 100644
--- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch
+++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch
@@ -1,20 +1,19 @@
-From b8e791ce93a467081fb1594b91841e2f57c634a0 Mon Sep 17 00:00:00 2001
+From 3ab3ac2876cbf4a34a94f0d3256a5be9d1202370 Mon Sep 17 00:00:00 2001
 From: Qian Lei <qianl.fnst@cn.fujitsu.com>
 Date: Fri, 16 Jan 2015 18:37:26 +0800
 Subject: [PATCH] Fix error
 
 Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
----
 Upstream-Status: Pending
-
+---
  swig/python/CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt
-index 3976296..8073fc8 100644
+index 93b4755..a7268f0 100644
 --- a/swig/python/CMakeLists.txt
 +++ b/swig/python/CMakeLists.txt
-@@ -27,7 +27,7 @@ SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/../cmpi.i" )
+@@ -26,7 +26,7 @@ SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/../cmpi.i" )
  ADD_CUSTOM_COMMAND (
     OUTPUT  ${SWIG_OUTPUT}
     COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for Python ..."
@@ -23,6 +22,3 @@ index 3976296..8073fc8 100644
     COMMAND ${CMAKE_COMMAND} -E echo "Done."
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i
--- 
-1.8.3.1
-
diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Modify-cmakelist.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Modify-cmakelist.patch
deleted file mode 100644
index 92e5e5662..000000000
--- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Modify-cmakelist.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 070822507befe7c1b8bb1be2d36cb12141d03b8f Mon Sep 17 00:00:00 2001
-From: Qian Lei <qianl.fnst@cn.fujitsu.com>
-Date: Tue, 6 Jan 2015 18:38:32 +0800
-Subject: [PATCH] Change the install path in cmakelist
-
-Upstream-Status: Pending
-Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
----
- swig/python/CMakeLists.txt | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt
-index 3976296..93c87c1 100644
---- a/swig/python/CMakeLists.txt
-+++ b/swig/python/CMakeLists.txt
-@@ -56,18 +56,18 @@ TARGET_LINK_LIBRARIES( ${NAME} util )
- 
- INSTALL(TARGETS ${NAME} LIBRARY DESTINATION ${CMPI_LIBRARY_DIR})
- # .py: swig generated
--INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmpi.py DESTINATION ${PYTHON_SITE_DIR} )
-+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmpi.py DESTINATION $ENV{ENV_INSTALL_PATH} )
- 
- 
- #
- # cmpi_pywbem_bindings.py: provider implementation
- #
--INSTALL(FILES cmpi_pywbem_bindings.py DESTINATION ${PYTHON_SITE_DIR} )
-+INSTALL(FILES cmpi_pywbem_bindings.py DESTINATION $ENV{ENV_INSTALL_PATH} )
- #INSTALL(FILES Py_UnixProcessProvider.py DESTINATION /usr/lib/pycim )
- 
--INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"from py_compile import compile; compile('\$ENV{DESTDIR}${PYTHON_SITE_DIR}/cmpi.py', dfile='${PYTHON_SITE_DIR}/cmpi.py')\")")
-+INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"from py_compile import compile; compile('\$ENV{DESTDIR}$ENV{ENV_INSTALL_PATH}/cmpi.py', dfile='\$ENV{ENV_INSTALL_PATH}/cmpi.py')\")")
- 
--INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"from py_compile import compile; compile('\$ENV{DESTDIR}${PYTHON_SITE_DIR}/cmpi_pywbem_bindings.py', dfile='${PYTHON_SITE_DIR}/cmpi_pywbem_bindings.py')\")")
-+INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"from py_compile import compile; compile('\$ENV{DESTDIR}$ENV{ENV_INSTALL_PATH}/cmpi_pywbem_bindings.py', dfile='$ENV{ENV_INSTALL_PATH}/cmpi_pywbem_bindings.py')\")")
- 
- 
- 
--- 
-1.8.3.1
-
diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-the-build-error-when-python-3.0.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-the-build-error-when-python-3.0.patch
deleted file mode 100644
index 5d5652a5f..000000000
--- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-the-build-error-when-python-3.0.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 323ced03a66e6cd963d8277b66cfcc7dce740be7 Mon Sep 17 00:00:00 2001
-From: Lei Maohui <leimaohui@cn.fujitsu.com>
-Date: Fri, 17 Jul 2015 01:33:43 -0700
-Subject: [PATCH] fix Xthe build error when python>3.0
-
-Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
----
-Upstream-Status: Pending
-
- src/target_python.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/target_python.c b/src/target_python.c
-index 90b43a1..2b76c9e 100644
---- a/src/target_python.c
-+++ b/src/target_python.c
-@@ -167,7 +167,12 @@ PyGlobalInitialize(const CMPIBroker* broker, CMPIStatus* st)
-   
-   Py_SetProgramName("cmpi_swig");
-   Py_Initialize();
--  SWIGEXPORT void SWIG_init(void);
-+#if PY_VERSION_HEX >= 0x03000000
-+SWIGEXPORT PyObject*
-+#else
-+  SWIGEXPORT void 
-+#endif
-+  SWIG_init(void);
-   SWIG_init();
-   cmpiMainPyThreadState = PyGILState_GetThisThreadState();
-   PyEval_ReleaseThread(cmpiMainPyThreadState); 
--- 
-2.1.0
-
diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-no-ruby-perl.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-no-ruby-perl.patch
index 2072da72b..1f9e2394c 100644
--- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-no-ruby-perl.patch
+++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-no-ruby-perl.patch
@@ -1,4 +1,4 @@
-From 7dd01e33f9dac75f177113de9a8ff458d4263a11 Mon Sep 17 00:00:00 2001
+From 0871fb048a48a02ec598c941e577f13d8d24f574 Mon Sep 17 00:00:00 2001
 From: Lei Maohui <leimaohui@cn.fujitsu.com>
 Date: Mon, 24 Aug 2015 11:00:13 +0900
 Subject: [PATCH] cmpi-bindings-0.4.17 no ruby perl
@@ -7,17 +7,18 @@ Port from Fedora20
 
 Upstream-Status: Pending
 Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
+
 ---
  swig/CMakeLists.txt | 22 +++++++++++-----------
  1 file changed, 11 insertions(+), 11 deletions(-)
 
 diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt
-index 8b5555c..c2655b9 100644
+index 00bf40c..d3cab38 100644
 --- a/swig/CMakeLists.txt
 +++ b/swig/CMakeLists.txt
-@@ -15,15 +15,15 @@ IF (PYTHON_LIBRARY)
-   ENDIF (PYTHON_LINK_LIBS)
- ENDIF (PYTHON_LIBRARY)
+@@ -49,15 +49,15 @@ ELSE (BUILD_PYTHON2)
+   MESSAGE(STATUS "*****")
+ ENDIF (BUILD_PYTHON3)
  
 -FIND_PACKAGE(Perl)
 -IF (PERL_EXECUTABLE)
@@ -42,6 +43,3 @@ index 8b5555c..c2655b9 100644
 +#  ADD_SUBDIRECTORY(ruby)
 +#  OPTION( BUILD_RUBY_GEM "Build Ruby GEM" YES )
 +#ENDIF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
--- 
-1.8.4.2
-
diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-sblim-sigsegv.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-sblim-sigsegv.patch
index b99337204..04abd5e4b 100644
--- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-sblim-sigsegv.patch
+++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-sblim-sigsegv.patch
@@ -1,12 +1,20 @@
-Port from Fedora20
+From bc32342fa63b8359f985fe1e187e811455c96a50 Mon Sep 17 00:00:00 2001
+From: Qian Lei <qianl.fnst@cn.fujitsu.com>
+Date: Tue, 25 Aug 2015 13:19:51 +0800
+Subject: [PATCH] Port from Fedora20
 
 Upstream-Status: Pending
 Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
 
-diff -up cmpi-bindings-0.4.17/swig/python/cmpi_pywbem_bindings.py.orig cmpi-bindings-0.4.17/swig/python/cmpi_pywbem_bindings.py
---- cmpi-bindings-0.4.17/swig/python/cmpi_pywbem_bindings.py.orig	2012-03-01 17:05:31.878367281 +0100
-+++ cmpi-bindings-0.4.17/swig/python/cmpi_pywbem_bindings.py	2012-03-01 17:06:34.718110137 +0100
-@@ -350,10 +350,10 @@ class BrokerCIMOMHandle(object):
+---
+ swig/python/cmpi_pywbem_bindings.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/swig/python/cmpi_pywbem_bindings.py b/swig/python/cmpi_pywbem_bindings.py
+index d643990..7f0cc77 100644
+--- a/swig/python/cmpi_pywbem_bindings.py
++++ b/swig/python/cmpi_pywbem_bindings.py
+@@ -361,10 +361,10 @@ class BrokerCIMOMHandle(object):
              allow_null_ns = False
          else:
              allow_null_ns = True
diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.9.5-python-lib-dir.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.9.5-python-lib-dir.patch
deleted file mode 100644
index b6a51ec0d..000000000
--- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.9.5-python-lib-dir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Port from Fedora20
-
-Upstream-Status: Pending
-Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
-
-diff -up cmpi-bindings-0.9.5/swig/python/CMakeLists.txt.old cmpi-bindings-0.9.5/swig/python/CMakeLists.txt
---- cmpi-bindings-0.9.5/swig/python/CMakeLists.txt.old	2013-08-06 15:57:03.576285764 +0200
-+++ cmpi-bindings-0.9.5/swig/python/CMakeLists.txt	2013-08-06 15:57:14.891345941 +0200
-@@ -9,7 +9,7 @@ SET (BUILD_SHARED_LIBS ON)
- 
- FIND_PACKAGE(PythonInterp REQUIRED)
- 
--EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" OUTPUT_VARIABLE PYTHON_LIB_DIR)
-+EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(1))" OUTPUT_VARIABLE PYTHON_LIB_DIR)
- 
- IF (NOT PYTHON_SITE_DIR)
-   SET (PYTHON_SITE_DIR ${PYTHON_LIB_DIR})
diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb
similarity index 61%
rename from meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb
rename to meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb
index 3b7453536..781dc83da 100644
--- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb
+++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb
@@ -4,39 +4,31 @@ HOMEPAGE = "http://github.com/kkaempf/cmpi-bindings"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b19ee058d2d5f69af45da98051d91064"
 SECTION = "Development/Libraries"
-DEPENDS = "swig-native python3 sblim-cmpi-devel"
+DEPENDS = "swig-native sblim-cmpi-devel python3-setuptools-native"
 
 SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=https;branch=master \
            file://cmpi-bindings-0.4.17-no-ruby-perl.patch \
            file://cmpi-bindings-0.4.17-sblim-sigsegv.patch \
-           file://cmpi-bindings-0.9.5-python-lib-dir.patch \
-           file://0001-Modify-cmakelist.patch \
            file://0001-Fix-error.patch \
-           file://0001-fix-the-build-error-when-python-3.0.patch \
-           file://0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch \
-          "
+           "
 
-SRCREV = "62f60e065aa1b901f826e4f530c0573ae32d065e"
+SRCREV = "69077ee4d249816ed428155fc933dca424167e77"
 S = "${WORKDIR}/git"
 
-inherit cmake python3native
+inherit cmake python3targetconfig
 
 EXTRA_OECMAKE = "-DLIB='${baselib}' \
                  -DPYTHON_INCLUDE_PATH=${STAGING_INCDIR}/python${PYTHON_BASEVERSION} \
                  -DPYTHON_ABI=${PYTHON_ABI} \
+                 -DBUILD_PYTHON3=YES \
+                 -DPython3_SITE_DIR=${PYTHON_SITEPACKAGES_DIR} \
                  "
 
 # With Ninja it fails with:
 # ninja: error: build.ninja:282: bad $-escape (literal $ must be written as $$)
 OECMAKE_GENERATOR = "Unix Makefiles"
 
-do_configure:prepend() {
-    export STAGING_LIBDIR=${STAGING_LIBDIR}
-    export STAGING_INCDIR=${STAGING_INCDIR}
-    export ENV_INSTALL_PATH=${PYTHON_SITEPACKAGES_DIR}
-}
-
-FILES:${PN} =+"${libdir}/cmpi/libpyCmpiProvider.so ${PYTHON_SITEPACKAGES_DIR}/*"
+FILES:${PN} =+"${libdir}/cmpi/libpy3CmpiProvider.so ${PYTHON_SITEPACKAGES_DIR}/*"
 FILES:${PN}-dbg =+ "${libdir}/cmpi/.debug/libpyCmpiProvider.so"
 
 BBCLASSEXTEND = "native"
-- 
2.39.2

[PATCH 05/23] libpwquality: backport a python 3.12 compatibility patch

[Alexander Kanavin]

This also allows dropping a previous patch.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...-Use-setuptools-instead-of-distutils.patch | 78 +++++++++++++++++++
 ...missing-python-include-dir-for-cross.patch | 43 ----------
 .../libpwquality/libpwquality_1.4.5.bb        |  6 +-
 3 files changed, 81 insertions(+), 46 deletions(-)
 create mode 100644 meta-oe/recipes-extended/libpwquality/files/0001-Use-setuptools-instead-of-distutils.patch
 delete mode 100644 meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch

diff --git a/meta-oe/recipes-extended/libpwquality/files/0001-Use-setuptools-instead-of-distutils.patch b/meta-oe/recipes-extended/libpwquality/files/0001-Use-setuptools-instead-of-distutils.patch
new file mode 100644
index 000000000..7eaca66b5
--- /dev/null
+++ b/meta-oe/recipes-extended/libpwquality/files/0001-Use-setuptools-instead-of-distutils.patch
@@ -0,0 +1,78 @@
+From ad95b7684365dea8335c34527d4c1463c1668af0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Fri, 31 Mar 2023 14:52:19 +0200
+Subject: [PATCH] Use setuptools instead of distutils
+
+distutils is removed from Python 3.12+:
+https://peps.python.org/pep-0632/
+
+Upstream-Status: Backport [https://github.com/libpwquality/libpwquality/commit/7b5e0f0097faebdcc6a8b783237bbba7a983147a]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ libpwquality.spec.in | 11 ++---------
+ python/Makefile.am   |  2 +-
+ python/setup.py.in   |  6 +++---
+ 3 files changed, 6 insertions(+), 13 deletions(-)
+
+diff --git a/libpwquality.spec.in b/libpwquality.spec.in
+index 70a6f53..0809126 100644
+--- a/libpwquality.spec.in
++++ b/libpwquality.spec.in
+@@ -33,9 +33,11 @@ BuildRequires: gettext
+ BuildRequires: pam-devel
+ %if %{with python2}
+ BuildRequires: python2-devel
++BuildRequires: python2-setuptools
+ %endif
+ %if %{with python3}
+ BuildRequires: python3-devel
++BuildRequires: python3-setuptools
+ %endif
+ 
+ URL: https://github.com/libpwquality/libpwquality/
+@@ -103,15 +105,6 @@ cp -a . %{py3dir}
+ pushd %{py3dir}
+ %endif
+ %if %{with python3}
+-# setuptools >= 60 changes the environment to use its bundled copy of distutils
+-# by default, not the Python-bundled one. To run the Python's standard library
+-# distutils, the environment variable must be set.
+-# Although technically setuptools is not needed for this package, if it's
+-# pulled by another package, it changes the environment and consequently,
+-# the build fails. This was reported in:
+-# https://github.com/pypa/setuptools/issues/3143
+-export SETUPTOOLS_USE_DISTUTILS=stdlib
+-
+ %configure \
+ 	--with-securedir=%{_moduledir} \
+ 	--with-pythonsitedir=%{python3_sitearch} \
+diff --git a/python/Makefile.am b/python/Makefile.am
+index 1d00c0c..6e51744 100644
+--- a/python/Makefile.am
++++ b/python/Makefile.am
+@@ -14,7 +14,7 @@ all-local:
+ 	CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV)
+ 
+ install-exec-local:
+-	CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix}
++	CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --root ${DESTDIR} --prefix=${prefix}
+ 
+ clean-local:
+ 	rm -rf py$(PYTHONREV)
+diff --git a/python/setup.py.in b/python/setup.py.in
+index a741b91..f934c50 100755
+--- a/python/setup.py.in
++++ b/python/setup.py.in
+@@ -6,9 +6,9 @@
+ 
+ import os
+ 
+-from distutils.core import setup, Extension
+-from distutils.command.build_ext import build_ext as _build_ext
+-from distutils.command.sdist import sdist as _sdist
++from setuptools import setup, Extension
++from setuptools.command.build_ext import build_ext as _build_ext
++from setuptools.command.sdist import sdist as _sdist
+ 
+ def genconstants(headerfile, outputfile):
+     hf = open(headerfile, 'r')
diff --git a/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch b/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch
deleted file mode 100644
index 636b29407..000000000
--- a/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 1ea09e09ab2387c326bb7170835361ece6e25477 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Mon, 3 Aug 2015 13:43:14 +0800
-Subject: [PATCH] setup.py.in: add missing python include dir for cross
- compiling
-
-Upstream-Status: Inappropriate [oe-core specific]
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- python/Makefile.am | 2 +-
- python/setup.py.in | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/python/Makefile.am b/python/Makefile.am
-index 1d00c0c..52816b2 100644
---- a/python/Makefile.am
-+++ b/python/Makefile.am
-@@ -14,7 +14,7 @@ all-local:
- 	CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV)
- 
- install-exec-local:
--	CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix}
-+	CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix} --install-lib=${DESTDIR}/${PYTHONSITEDIR}
- 
- clean-local:
- 	rm -rf py$(PYTHONREV)
-diff --git a/python/setup.py.in b/python/setup.py.in
-index a741b91..6759a95 100755
---- a/python/setup.py.in
-+++ b/python/setup.py.in
-@@ -33,7 +33,7 @@ class sdist(_sdist):
- 
- pwqmodule = Extension('pwquality',
-             sources = ['pwquality.c'],
--            include_dirs = ['../src'],
-+            include_dirs = ['../src', os.path.join(os.environ['STAGING_INCDIR'], os.environ['PYTHON_DIR'])],
-             library_dirs = ['../src/.libs'],
-             libraries = ['pwquality'])
- 
--- 
-2.17.1
-
diff --git a/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb b/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb
index 5287430c4..91afedcb6 100644
--- a/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb
+++ b/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb
@@ -5,11 +5,11 @@ SECTION = "devel/lib"
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bd2f1386df813a459a0c34fde676fc2"
 
-DEPENDS = "cracklib"
+DEPENDS = "cracklib python3-setuptools-native"
 
 SRC_URI = "git://github.com/libpwquality/libpwquality;branch=master;protocol=https \
-           file://add-missing-python-include-dir-for-cross.patch \
-"
+           file://0001-Use-setuptools-instead-of-distutils.patch \
+           "
 SRCREV = "5490e96a3dd6ed7371435ca5b3ccef98bdb48b5a"
 
 S = "${WORKDIR}/git"
-- 
2.39.2

Re: [oe] [PATCH 05/23] libpwquality: backport a python 3.12 compatibility patch

[Martin Jansa]

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

It doesn't respect libdir now, causing installed-vs-shipped e.g. in
multilib builds with libdir set to /usr/lib32:

ERROR: QA Issue: lib32-libpwquality: Files/directories were installed but
not shipped in any package:
  /usr/lib/python3.11/site-packages/
pwquality.cpython-311-arm-linux-gnueabi.so
  /usr/lib/python3.11/site-packages/pwquality-1.4.5-py3.11.egg-info

/usr/lib/python3.11/site-packages/pwquality-1.4.5-py3.11.egg-info/SOURCES.txt
  /usr/lib/python3.11/site-packages/pwquality-1.4.5-py3.11.egg-info/PKG-INFO

/usr/lib/python3.11/site-packages/pwquality-1.4.5-py3.11.egg-info/dependency_links.txt

/usr/lib/python3.11/site-packages/pwquality-1.4.5-py3.11.egg-info/top_level.txt
Please set FILES such that these items are packaged. Alternatively if they
are unneeded, avoid installing them or delete them within do_install.
lib32-libpwquality: 6 installed and not shipped files.
[installed-vs-shipped]

On Sun, Dec 31, 2023 at 1:23 PM Alexander Kanavin <alex.kanavin@gmail.com>
wrote:

> This also allows dropping a previous patch.
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  ...-Use-setuptools-instead-of-distutils.patch | 78 +++++++++++++++++++
>  ...missing-python-include-dir-for-cross.patch | 43 ----------
>  .../libpwquality/libpwquality_1.4.5.bb        |  6 +-
>  3 files changed, 81 insertions(+), 46 deletions(-)
>  create mode 100644
> meta-oe/recipes-extended/libpwquality/files/0001-Use-setuptools-instead-of-distutils.patch
>  delete mode 100644
> meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch
>
> diff --git
> a/meta-oe/recipes-extended/libpwquality/files/0001-Use-setuptools-instead-of-distutils.patch
> b/meta-oe/recipes-extended/libpwquality/files/0001-Use-setuptools-instead-of-distutils.patch
> new file mode 100644
> index 000000000..7eaca66b5
> --- /dev/null
> +++
> b/meta-oe/recipes-extended/libpwquality/files/0001-Use-setuptools-instead-of-distutils.patch
> @@ -0,0 +1,78 @@
> +From ad95b7684365dea8335c34527d4c1463c1668af0 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
> +Date: Fri, 31 Mar 2023 14:52:19 +0200
> +Subject: [PATCH] Use setuptools instead of distutils
> +
> +distutils is removed from Python 3.12+:
> +https://peps.python.org/pep-0632/
> +
> +Upstream-Status: Backport [
> https://github.com/libpwquality/libpwquality/commit/7b5e0f0097faebdcc6a8b783237bbba7a983147a
> ]
> +Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> +---
> + libpwquality.spec.in | 11 ++---------
> + python/Makefile.am   |  2 +-
> + python/setup.py.in   |  6 +++---
> + 3 files changed, 6 insertions(+), 13 deletions(-)
> +
> +diff --git a/libpwquality.spec.in b/libpwquality.spec.in
> +index 70a6f53..0809126 100644
> +--- a/libpwquality.spec.in
> ++++ b/libpwquality.spec.in
> +@@ -33,9 +33,11 @@ BuildRequires: gettext
> + BuildRequires: pam-devel
> + %if %{with python2}
> + BuildRequires: python2-devel
> ++BuildRequires: python2-setuptools
> + %endif
> + %if %{with python3}
> + BuildRequires: python3-devel
> ++BuildRequires: python3-setuptools
> + %endif
> +
> + URL: https://github.com/libpwquality/libpwquality/
> +@@ -103,15 +105,6 @@ cp -a . %{py3dir}
> + pushd %{py3dir}
> + %endif
> + %if %{with python3}
> +-# setuptools >= 60 changes the environment to use its bundled copy of
> distutils
> +-# by default, not the Python-bundled one. To run the Python's standard
> library
> +-# distutils, the environment variable must be set.
> +-# Although technically setuptools is not needed for this package, if it's
> +-# pulled by another package, it changes the environment and consequently,
> +-# the build fails. This was reported in:
> +-# https://github.com/pypa/setuptools/issues/3143
> +-export SETUPTOOLS_USE_DISTUTILS=stdlib
> +-
> + %configure \
> +       --with-securedir=%{_moduledir} \
> +       --with-pythonsitedir=%{python3_sitearch} \
> +diff --git a/python/Makefile.am b/python/Makefile.am
> +index 1d00c0c..6e51744 100644
> +--- a/python/Makefile.am
> ++++ b/python/Makefile.am
> +@@ -14,7 +14,7 @@ all-local:
> +       CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py
> build --build-base py$(PYTHONREV)
> +
> + install-exec-local:
> +-      CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py
> build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix}
> ++      CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py
> build --build-base py$(PYTHONREV) install --root ${DESTDIR}
> --prefix=${prefix}
> +
> + clean-local:
> +       rm -rf py$(PYTHONREV)
> +diff --git a/python/setup.py.in b/python/setup.py.in
> +index a741b91..f934c50 100755
> +--- a/python/setup.py.in
> ++++ b/python/setup.py.in
> +@@ -6,9 +6,9 @@
> +
> + import os
> +
> +-from distutils.core import setup, Extension
> +-from distutils.command.build_ext import build_ext as _build_ext
> +-from distutils.command.sdist import sdist as _sdist
> ++from setuptools import setup, Extension
> ++from setuptools.command.build_ext import build_ext as _build_ext
> ++from setuptools.command.sdist import sdist as _sdist
> +
> + def genconstants(headerfile, outputfile):
> +     hf = open(headerfile, 'r')
> diff --git
> a/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch
> b/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch
> deleted file mode 100644
> index 636b29407..000000000
> ---
> a/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch
> +++ /dev/null
> @@ -1,43 +0,0 @@
> -From 1ea09e09ab2387c326bb7170835361ece6e25477 Mon Sep 17 00:00:00 2001
> -From: Hongxu Jia <hongxu.jia@windriver.com>
> -Date: Mon, 3 Aug 2015 13:43:14 +0800
> -Subject: [PATCH] setup.py.in: add missing python include dir for cross
> - compiling
> -
> -Upstream-Status: Inappropriate [oe-core specific]
> -
> -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ----
> - python/Makefile.am | 2 +-
> - python/setup.py.in | 3 ++-
> - 2 files changed, 3 insertions(+), 2 deletions(-)
> -
> -diff --git a/python/Makefile.am b/python/Makefile.am
> -index 1d00c0c..52816b2 100644
> ---- a/python/Makefile.am
> -+++ b/python/Makefile.am
> -@@ -14,7 +14,7 @@ all-local:
> -       CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py
> build --build-base py$(PYTHONREV)
> -
> - install-exec-local:
> --      CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py
> build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix}
> -+      CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py
> build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix}
> --install-lib=${DESTDIR}/${PYTHONSITEDIR}
> -
> - clean-local:
> -       rm -rf py$(PYTHONREV)
> -diff --git a/python/setup.py.in b/python/setup.py.in
> -index a741b91..6759a95 100755
> ---- a/python/setup.py.in
> -+++ b/python/setup.py.in
> -@@ -33,7 +33,7 @@ class sdist(_sdist):
> -
> - pwqmodule = Extension('pwquality',
> -             sources = ['pwquality.c'],
> --            include_dirs = ['../src'],
> -+            include_dirs = ['../src',
> os.path.join(os.environ['STAGING_INCDIR'], os.environ['PYTHON_DIR'])],
> -             library_dirs = ['../src/.libs'],
> -             libraries = ['pwquality'])
> -
> ---
> -2.17.1
> -
> diff --git a/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb
> b/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb
> index 5287430c4..91afedcb6 100644
> --- a/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb
> +++ b/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb
> @@ -5,11 +5,11 @@ SECTION = "devel/lib"
>  LICENSE = "GPL-2.0-or-later"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=6bd2f1386df813a459a0c34fde676fc2"
>
> -DEPENDS = "cracklib"
> +DEPENDS = "cracklib python3-setuptools-native"
>
>  SRC_URI = "git://
> github.com/libpwquality/libpwquality;branch=master;protocol=https \
> -           file://add-missing-python-include-dir-for-cross.patch \
> -"
> +           file://0001-Use-setuptools-instead-of-distutils.patch \
> +           "
>  SRCREV = "5490e96a3dd6ed7371435ca5b3ccef98bdb48b5a"
>
>  S = "${WORKDIR}/git"
> --
> 2.39.2
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#107956):
> https://lists.openembedded.org/g/openembedded-devel/message/107956
> Mute This Topic: https://lists.openembedded.org/mt/103445561/3617156
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> martin.jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>

[-- Attachment #2: Type: text/html, Size: 12692 bytes --]

Re: [oe] [PATCH 05/23] libpwquality: backport a python 3.12 compatibility patch

[Alexander Kanavin]

I guess this change needs to be rebased and restored on top of the
backported patch:

--      CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@
setup.py build --build-base py$(PYTHONREV) install
--prefix=${DESTDIR}${prefix}
-+      CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@
setup.py build --build-base py$(PYTHONREV) install
--prefix=${DESTDIR}${prefix} --install-lib=${DESTDIR}/${PYTHONSITEDIR}

Can you try that please?

Alex

On Wed, 10 Jan 2024 at 12:43, Martin Jansa <martin.jansa@gmail.com> wrote:
>
> It doesn't respect libdir now, causing installed-vs-shipped e.g. in multilib builds with libdir set to /usr/lib32:
>
> ERROR: QA Issue: lib32-libpwquality: Files/directories were installed but not shipped in any package:
>   /usr/lib/python3.11/site-packages/pwquality.cpython-311-arm-linux-gnueabi.so
>   /usr/lib/python3.11/site-packages/pwquality-1.4.5-py3.11.egg-info
>   /usr/lib/python3.11/site-packages/pwquality-1.4.5-py3.11.egg-info/SOURCES.txt
>   /usr/lib/python3.11/site-packages/pwquality-1.4.5-py3.11.egg-info/PKG-INFO
>   /usr/lib/python3.11/site-packages/pwquality-1.4.5-py3.11.egg-info/dependency_links.txt
>   /usr/lib/python3.11/site-packages/pwquality-1.4.5-py3.11.egg-info/top_level.txt
> Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
> lib32-libpwquality: 6 installed and not shipped files. [installed-vs-shipped]
>
> On Sun, Dec 31, 2023 at 1:23 PM Alexander Kanavin <alex.kanavin@gmail.com> wrote:
>>
>> This also allows dropping a previous patch.
>>
>> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
>> ---
>>  ...-Use-setuptools-instead-of-distutils.patch | 78 +++++++++++++++++++
>>  ...missing-python-include-dir-for-cross.patch | 43 ----------
>>  .../libpwquality/libpwquality_1.4.5.bb        |  6 +-
>>  3 files changed, 81 insertions(+), 46 deletions(-)
>>  create mode 100644 meta-oe/recipes-extended/libpwquality/files/0001-Use-setuptools-instead-of-distutils.patch
>>  delete mode 100644 meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch
>>
>> diff --git a/meta-oe/recipes-extended/libpwquality/files/0001-Use-setuptools-instead-of-distutils.patch b/meta-oe/recipes-extended/libpwquality/files/0001-Use-setuptools-instead-of-distutils.patch
>> new file mode 100644
>> index 000000000..7eaca66b5
>> --- /dev/null
>> +++ b/meta-oe/recipes-extended/libpwquality/files/0001-Use-setuptools-instead-of-distutils.patch
>> @@ -0,0 +1,78 @@
>> +From ad95b7684365dea8335c34527d4c1463c1668af0 Mon Sep 17 00:00:00 2001
>> +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
>> +Date: Fri, 31 Mar 2023 14:52:19 +0200
>> +Subject: [PATCH] Use setuptools instead of distutils
>> +
>> +distutils is removed from Python 3.12+:
>> +https://peps.python.org/pep-0632/
>> +
>> +Upstream-Status: Backport [https://github.com/libpwquality/libpwquality/commit/7b5e0f0097faebdcc6a8b783237bbba7a983147a]
>> +Signed-off-by: Alexander Kanavin <alex@linutronix.de>
>> +---
>> + libpwquality.spec.in | 11 ++---------
>> + python/Makefile.am   |  2 +-
>> + python/setup.py.in   |  6 +++---
>> + 3 files changed, 6 insertions(+), 13 deletions(-)
>> +
>> +diff --git a/libpwquality.spec.in b/libpwquality.spec.in
>> +index 70a6f53..0809126 100644
>> +--- a/libpwquality.spec.in
>> ++++ b/libpwquality.spec.in
>> +@@ -33,9 +33,11 @@ BuildRequires: gettext
>> + BuildRequires: pam-devel
>> + %if %{with python2}
>> + BuildRequires: python2-devel
>> ++BuildRequires: python2-setuptools
>> + %endif
>> + %if %{with python3}
>> + BuildRequires: python3-devel
>> ++BuildRequires: python3-setuptools
>> + %endif
>> +
>> + URL: https://github.com/libpwquality/libpwquality/
>> +@@ -103,15 +105,6 @@ cp -a . %{py3dir}
>> + pushd %{py3dir}
>> + %endif
>> + %if %{with python3}
>> +-# setuptools >= 60 changes the environment to use its bundled copy of distutils
>> +-# by default, not the Python-bundled one. To run the Python's standard library
>> +-# distutils, the environment variable must be set.
>> +-# Although technically setuptools is not needed for this package, if it's
>> +-# pulled by another package, it changes the environment and consequently,
>> +-# the build fails. This was reported in:
>> +-# https://github.com/pypa/setuptools/issues/3143
>> +-export SETUPTOOLS_USE_DISTUTILS=stdlib
>> +-
>> + %configure \
>> +       --with-securedir=%{_moduledir} \
>> +       --with-pythonsitedir=%{python3_sitearch} \
>> +diff --git a/python/Makefile.am b/python/Makefile.am
>> +index 1d00c0c..6e51744 100644
>> +--- a/python/Makefile.am
>> ++++ b/python/Makefile.am
>> +@@ -14,7 +14,7 @@ all-local:
>> +       CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV)
>> +
>> + install-exec-local:
>> +-      CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix}
>> ++      CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --root ${DESTDIR} --prefix=${prefix}
>> +
>> + clean-local:
>> +       rm -rf py$(PYTHONREV)
>> +diff --git a/python/setup.py.in b/python/setup.py.in
>> +index a741b91..f934c50 100755
>> +--- a/python/setup.py.in
>> ++++ b/python/setup.py.in
>> +@@ -6,9 +6,9 @@
>> +
>> + import os
>> +
>> +-from distutils.core import setup, Extension
>> +-from distutils.command.build_ext import build_ext as _build_ext
>> +-from distutils.command.sdist import sdist as _sdist
>> ++from setuptools import setup, Extension
>> ++from setuptools.command.build_ext import build_ext as _build_ext
>> ++from setuptools.command.sdist import sdist as _sdist
>> +
>> + def genconstants(headerfile, outputfile):
>> +     hf = open(headerfile, 'r')
>> diff --git a/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch b/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch
>> deleted file mode 100644
>> index 636b29407..000000000
>> --- a/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch
>> +++ /dev/null
>> @@ -1,43 +0,0 @@
>> -From 1ea09e09ab2387c326bb7170835361ece6e25477 Mon Sep 17 00:00:00 2001
>> -From: Hongxu Jia <hongxu.jia@windriver.com>
>> -Date: Mon, 3 Aug 2015 13:43:14 +0800
>> -Subject: [PATCH] setup.py.in: add missing python include dir for cross
>> - compiling
>> -
>> -Upstream-Status: Inappropriate [oe-core specific]
>> -
>> -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
>> ----
>> - python/Makefile.am | 2 +-
>> - python/setup.py.in | 3 ++-
>> - 2 files changed, 3 insertions(+), 2 deletions(-)
>> -
>> -diff --git a/python/Makefile.am b/python/Makefile.am
>> -index 1d00c0c..52816b2 100644
>> ---- a/python/Makefile.am
>> -+++ b/python/Makefile.am
>> -@@ -14,7 +14,7 @@ all-local:
>> -       CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV)
>> -
>> - install-exec-local:
>> --      CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix}
>> -+      CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix} --install-lib=${DESTDIR}/${PYTHONSITEDIR}
>> -
>> - clean-local:
>> -       rm -rf py$(PYTHONREV)
>> -diff --git a/python/setup.py.in b/python/setup.py.in
>> -index a741b91..6759a95 100755
>> ---- a/python/setup.py.in
>> -+++ b/python/setup.py.in
>> -@@ -33,7 +33,7 @@ class sdist(_sdist):
>> -
>> - pwqmodule = Extension('pwquality',
>> -             sources = ['pwquality.c'],
>> --            include_dirs = ['../src'],
>> -+            include_dirs = ['../src', os.path.join(os.environ['STAGING_INCDIR'], os.environ['PYTHON_DIR'])],
>> -             library_dirs = ['../src/.libs'],
>> -             libraries = ['pwquality'])
>> -
>> ---
>> -2.17.1
>> -
>> diff --git a/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb b/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb
>> index 5287430c4..91afedcb6 100644
>> --- a/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb
>> +++ b/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb
>> @@ -5,11 +5,11 @@ SECTION = "devel/lib"
>>  LICENSE = "GPL-2.0-or-later"
>>  LIC_FILES_CHKSUM = "file://COPYING;md5=6bd2f1386df813a459a0c34fde676fc2"
>>
>> -DEPENDS = "cracklib"
>> +DEPENDS = "cracklib python3-setuptools-native"
>>
>>  SRC_URI = "git://github.com/libpwquality/libpwquality;branch=master;protocol=https \
>> -           file://add-missing-python-include-dir-for-cross.patch \
>> -"
>> +           file://0001-Use-setuptools-instead-of-distutils.patch \
>> +           "
>>  SRCREV = "5490e96a3dd6ed7371435ca5b3ccef98bdb48b5a"
>>
>>  S = "${WORKDIR}/git"
>> --
>> 2.39.2
>>
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#107956): https://lists.openembedded.org/g/openembedded-devel/message/107956
>> Mute This Topic: https://lists.openembedded.org/mt/103445561/3617156
>> Group Owner: openembedded-devel+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [martin.jansa@gmail.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>

[PATCH 06/23] mycroft: do not depend on python3-xmlrunner

[Alexander Kanavin]

Nothing in the source tree refers to it.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb b/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb
index 679789980..444bc1cf3 100644
--- a/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb
+++ b/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb
@@ -61,7 +61,7 @@ RDEPENDS:${PN} += "python3-requests python3-pillow \
                    python3-xxhash python3-pako \
                    python3-six python3-cryptography \
                    python3-requests-futures \
-                   python3-xmlrunner python3-fasteners \
+                   python3-fasteners \
                    python3-python-vlc \
                    python3-padatious python3-padaos \
                    python3-petact python3-precise-runner \
-- 
2.39.2

[PATCH 07/23] python3-xmlrunner: remove the recipe

[Alexander Kanavin]

Last release in 2014, not compatible with python 3.12.

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

diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
index 7b7d7bee9..0500ba19e 100644
--- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
+++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
@@ -459,7 +459,6 @@ RDEPENDS:packagegroup-meta-python3 = "\
     python3-wtforms \
     python3-xlrd \
     python3-xlsxwriter \
-    python3-xmlrunner \
     python3-xmltodict \
     python3-xmodem \
     python3-xstatic \
diff --git a/meta-python/recipes-devtools/python/python3-xmlrunner_1.7.7.bb b/meta-python/recipes-devtools/python/python3-xmlrunner_1.7.7.bb
deleted file mode 100644
index 7259c3fad..000000000
--- a/meta-python/recipes-devtools/python/python3-xmlrunner_1.7.7.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-SUMMARY = "unittest-based test runner with Ant/JUnit like XML reporting"
-HOMEPAGE = "https://github.com/pycontribs/xmlrunner"
-LICENSE = "LGPL-3.0-only"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=fa964f202b6ae067ed5828fe43c77c1a"
-
-SRC_URI[md5sum] = "7b0b152ed2d278516aedbc0cac22dfb3"
-SRC_URI[sha256sum] = "5a6113d049eca7646111ee657266966e5bbfb0b5ceb2e83ee0772e16d7110f39"
-
-inherit pypi setuptools3
-
-RDEPENDS:${PN} += "python3-unittest"
-- 
2.39.2

[PATCH 08/23] system-config-printer: rely on setuptools to obtain distutils copy

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../system-config-printer/system-config-printer_1.5.18.bb       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb b/meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb
index ead875824..cee907884 100644
--- a/meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb
+++ b/meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb
@@ -11,7 +11,7 @@ inherit autotools gettext pkgconfig python3native features_check
 
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
 
-DEPENDS = "cups glib-2.0 libusb xmlto-native desktop-file-utils-native autoconf-archive-native"
+DEPENDS = "cups glib-2.0 libusb xmlto-native desktop-file-utils-native autoconf-archive-native python3-setuptools-native"
 
 PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)}"
 PACKAGECONFIG[systemd] = ",--without-systemdsystemunitdir,systemd"
-- 
2.39.2

[PATCH 09/23] python3-gmpy2: fix python 3.12 issues

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../0001-src-fix-python-3.12-builds.patch     | 263 ++++++++++++++++++
 .../python/python3-gmpy2_2.1.5.bb             |   1 +
 2 files changed, 264 insertions(+)
 create mode 100644 meta-python/recipes-devtools/python/python3-gmpy2/0001-src-fix-python-3.12-builds.patch

diff --git a/meta-python/recipes-devtools/python/python3-gmpy2/0001-src-fix-python-3.12-builds.patch b/meta-python/recipes-devtools/python/python3-gmpy2/0001-src-fix-python-3.12-builds.patch
new file mode 100644
index 000000000..1171322e2
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-gmpy2/0001-src-fix-python-3.12-builds.patch
@@ -0,0 +1,263 @@
+From 43f132103cedfd92b85173bcdacfbabd5916d9fc Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Wed, 27 Dec 2023 14:52:16 +0100
+Subject: [PATCH] src: fix python 3.12 builds
+
+This is a backport for 3.1.x versions provided separately in https://github.com/aleaxit/gmpy/issues/446
+
+Upstream-Status: Inappropriate [can be dropped when 2.2.x is released]
+
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ src/gmpy2_convert.h       |  21 +++++++
+ src/gmpy2_convert_gmp.c   | 129 +++++++++++++-------------------------
+ src/gmpy2_convert_utils.c |   2 +-
+ 3 files changed, 65 insertions(+), 87 deletions(-)
+
+diff --git a/src/gmpy2_convert.h b/src/gmpy2_convert.h
+index f887d47..3e8cb2b 100644
+--- a/src/gmpy2_convert.h
++++ b/src/gmpy2_convert.h
+@@ -142,6 +142,27 @@ extern "C" {
+ #define IS_TYPE_COMPLEX_ONLY(x)     ((x > OBJ_TYPE_REAL) && \
+                                      (x < OBJ_TYPE_COMPLEX))
+ 
++/* Compatibility macros (to work with PyLongObject internals).
++ */
++
++#if PY_VERSION_HEX >= 0x030C0000
++#  define TAG_FROM_SIGN_AND_SIZE(is_neg, size) ((is_neg?2:(size==0)) | (((size_t)size) << 3))
++#  define _PyLong_SetSignAndDigitCount(obj, is_neg, size) (obj->long_value.lv_tag = TAG_FROM_SIGN_AND_SIZE(is_neg, size))
++#elif PY_VERSION_HEX >= 0x030900A4
++#  define _PyLong_SetSignAndDigitCount(obj, is_neg, size) (Py_SET_SIZE(obj, (is_neg?-1:1)*size))
++#else
++#  define _PyLong_SetSignAndDigitCount(obj, is_neg, size) (Py_SIZE(obj) = (is_neg?-1:1)*size)
++#endif
++
++#if PY_VERSION_HEX >= 0x030C0000
++#  define GET_OB_DIGIT(obj) obj->long_value.ob_digit
++#  define _PyLong_IsNegative(obj) ((obj->long_value.lv_tag & 3) == 2)
++#  define _PyLong_DigitCount(obj) (obj->long_value.lv_tag >> 3)
++#else
++#  define GET_OB_DIGIT(obj) obj->ob_digit
++#  define _PyLong_IsNegative(obj) (Py_SIZE(obj) < 0)
++#  define _PyLong_DigitCount(obj) (_PyLong_IsNegative(obj)? -Py_SIZE(obj):Py_SIZE(obj))
++#endif
+ 
+ /* Since the macros are used in gmpy2's codebase, these functions are skipped
+  * until they are needed for the C API in the future.
+diff --git a/src/gmpy2_convert_gmp.c b/src/gmpy2_convert_gmp.c
+index cf0891e..8b8df81 100644
+--- a/src/gmpy2_convert_gmp.c
++++ b/src/gmpy2_convert_gmp.c
+@@ -59,33 +59,24 @@ GMPy_MPZ_From_PyIntOrLong(PyObject *obj, CTXT_Object *context)
+     }
+ #endif
+ 
+-    switch (Py_SIZE(templong)) {
+-    case -1:
+-        mpz_set_si(result->z, -(sdigit)templong->ob_digit[0]);
++    len = _PyLong_DigitCount(templong);
++    negative = _PyLong_IsNegative(templong);
++
++    switch (len) {
++    case 1:
++        mpz_set_si(result->z, (sdigit)GET_OB_DIGIT(templong)[0]);
+         break;
+     case 0:
+         mpz_set_si(result->z, 0);
+         break;
+-    case 1:
+-        mpz_set_si(result->z, templong->ob_digit[0]);
+-        break;
+     default:
+-        mpz_set_si(result->z, 0);
+-
+-        if (Py_SIZE(templong) < 0) {
+-            len = - Py_SIZE(templong);
+-            negative = 1;
+-        } else {
+-            len = Py_SIZE(templong);
+-            negative = 0;
+-        }
+-
+-        mpz_import(result->z, len, -1, sizeof(templong->ob_digit[0]), 0,
+-                   sizeof(templong->ob_digit[0])*8 - PyLong_SHIFT, templong->ob_digit);
++        mpz_import(result->z, len, -1, sizeof(GET_OB_DIGIT(templong)[0]), 0,
++                   sizeof(GET_OB_DIGIT(templong)[0])*8 - PyLong_SHIFT,
++                   GET_OB_DIGIT(templong));
++    }
+ 
+-        if (negative) {
+-            mpz_neg(result->z, result->z);
+-        }
++    if (negative) {
++        mpz_neg(result->z, result->z);
+     }
+     return result;
+ }
+@@ -105,33 +96,24 @@ mpz_set_PyIntOrLong(mpz_t z, PyObject *obj)
+     }
+ #endif
+ 
+-    switch (Py_SIZE(templong)) {
+-    case -1:
+-        mpz_set_si(z, -(sdigit)templong->ob_digit[0]);
++    len = _PyLong_DigitCount(templong);
++    negative = _PyLong_IsNegative(templong);
++
++    switch (len) {
++    case 1:
++        mpz_set_si(z, (sdigit)GET_OB_DIGIT(templong)[0]);
+         break;
+     case 0:
+         mpz_set_si(z, 0);
+         break;
+-    case 1:
+-        mpz_set_si(z, templong->ob_digit[0]);
+-        break;
+     default:
+-        mpz_set_si(z, 0);
+-
+-        if (Py_SIZE(templong) < 0) {
+-            len = - Py_SIZE(templong);
+-            negative = 1;
+-        } else {
+-            len = Py_SIZE(templong);
+-            negative = 0;
+-        }
+-
+-        mpz_import(z, len, -1, sizeof(templong->ob_digit[0]), 0,
+-                   sizeof(templong->ob_digit[0])*8 - PyLong_SHIFT, templong->ob_digit);
++        mpz_import(z, len, -1, sizeof(GET_OB_DIGIT(templong)[0]), 0,
++                   sizeof(GET_OB_DIGIT(templong)[0])*8 - PyLong_SHIFT,
++                   GET_OB_DIGIT(templong));
++    }
+ 
+-        if (negative) {
+-            mpz_neg(z, z);
+-        }
++    if (negative) {
++        mpz_neg(z, z);
+     }
+     return;
+ }
+@@ -186,12 +168,7 @@ GMPy_PyLong_From_MPZ(MPZ_Object *obj, CTXT_Object *context)
+ 
+     /* Assume gmp uses limbs as least as large as the builtin longs do */
+ 
+-    if (mpz_sgn(obj->z) < 0) {
+-        negative = 1;
+-    } else {
+-        negative = 0;
+-    }
+-
++    negative = mpz_sgn(obj->z) < 0;
+     size = (mpz_sizeinbase(obj->z, 2) + PyLong_SHIFT - 1) / PyLong_SHIFT;
+ 
+     if (!(result = _PyLong_New(size))) {
+@@ -200,31 +177,20 @@ GMPy_PyLong_From_MPZ(MPZ_Object *obj, CTXT_Object *context)
+         /* LCOV_EXCL_STOP */
+     }
+ 
+-    mpz_export(result->ob_digit, &count, -1, sizeof(result->ob_digit[0]), 0,
+-               sizeof(result->ob_digit[0])*8 - PyLong_SHIFT, obj->z);
++    mpz_export(GET_OB_DIGIT(result), &count, -1, sizeof(GET_OB_DIGIT(result)[0]), 0,
++               sizeof(GET_OB_DIGIT(result)[0])*8 - PyLong_SHIFT, obj->z);
+ 
+     if (count == 0) {
+-        result->ob_digit[0] = 0;
++        GET_OB_DIGIT(result)[0] = 0;
+     }
+ 
+     /* long_normalize() is file-static so we must reimplement it */
+     /* longobjp = long_normalize(longobjp); */
+-    while ((size>0) && (result->ob_digit[size-1] == 0)) {
++    while ((size>0) && (GET_OB_DIGIT(result)[size-1] == 0)) {
+         size--;
+     }
+-#if PY_VERSION_HEX >= 0x030900A4
+-    Py_SET_SIZE(result, size);
+-#else
+-    Py_SIZE(result) = size;
+-#endif
+ 
+-    if (negative) {
+-#if PY_VERSION_HEX >= 0x030900A4
+-        Py_SET_SIZE(result, - Py_SIZE(result));
+-#else
+-        Py_SIZE(result) = - Py_SIZE(result);
+-#endif
+-    }
++    _PyLong_SetSignAndDigitCount(result, negative, size);
+     return (PyObject*)result;
+ }
+ 
+@@ -476,33 +442,24 @@ GMPy_XMPZ_From_PyIntOrLong(PyObject *obj, CTXT_Object *context)
+     }
+ #endif
+ 
+-    switch (Py_SIZE(templong)) {
+-    case -1:
+-        mpz_set_si(result->z, -(sdigit)templong->ob_digit[0]);
++    len = _PyLong_DigitCount(templong);
++    negative = _PyLong_IsNegative(templong);
++
++    switch (len) {
++    case 1:
++        mpz_set_si(result->z, (sdigit)GET_OB_DIGIT(templong)[0]);
+         break;
+     case 0:
+         mpz_set_si(result->z, 0);
+         break;
+-    case 1:
+-        mpz_set_si(result->z, templong->ob_digit[0]);
+-        break;
+     default:
+-        mpz_set_si(result->z, 0);
+-
+-        if (Py_SIZE(templong) < 0) {
+-            len = - Py_SIZE(templong);
+-            negative = 1;
+-        } else {
+-            len = Py_SIZE(templong);
+-            negative = 0;
+-        }
+-
+-        mpz_import(result->z, len, -1, sizeof(templong->ob_digit[0]), 0,
+-                   sizeof(templong->ob_digit[0])*8 - PyLong_SHIFT, templong->ob_digit);
++        mpz_import(result->z, len, -1, sizeof(GET_OB_DIGIT(templong)[0]), 0,
++                   sizeof(GET_OB_DIGIT(templong)[0])*8 - PyLong_SHIFT,
++                   GET_OB_DIGIT(templong));
++    }
+ 
+-        if (negative) {
+-            mpz_neg(result->z, result->z);
+-        }
++    if (negative) {
++        mpz_neg(result->z, result->z);
+     }
+     return result;
+ }
+@@ -639,7 +596,7 @@ GMPy_MPQ_From_PyStr(PyObject *s, int base, CTXT_Object *context)
+     }
+ 
+     cp = PyBytes_AsString(ascii_str);
+-    
++
+     {
+         char *whereslash = strchr((char*)cp, '/');
+         char *wheredot = strchr((char*)cp, '.');
+diff --git a/src/gmpy2_convert_utils.c b/src/gmpy2_convert_utils.c
+index d676eaf..8908d17 100644
+--- a/src/gmpy2_convert_utils.c
++++ b/src/gmpy2_convert_utils.c
+@@ -123,7 +123,7 @@ static unsigned long
+ GMPy_Integer_AsUnsignedLongWithType_v2(PyObject *x, int xtype)
+ {
+     if IS_TYPE_PyInteger(xtype) {
+-        if (Py_SIZE(x) < 0) {
++        if (_PyLong_IsNegative(((PyLongObject*)x))) {
+             VALUE_ERROR("n must be > 0");
+             return (unsigned long)-1;
+         }
diff --git a/meta-python/recipes-devtools/python/python3-gmpy2_2.1.5.bb b/meta-python/recipes-devtools/python/python3-gmpy2_2.1.5.bb
index 9a66af9a9..d9e9bd50e 100644
--- a/meta-python/recipes-devtools/python/python3-gmpy2_2.1.5.bb
+++ b/meta-python/recipes-devtools/python/python3-gmpy2_2.1.5.bb
@@ -10,5 +10,6 @@ PYPI_PACKAGE = "gmpy2"
 SRC_URI[sha256sum] = "bc297f1fd8c377ae67a4f493fc0f926e5d1b157e5c342e30a4d84dc7b9f95d96"
 
 inherit pypi setuptools3 python3native
+SRC_URI += "file://0001-src-fix-python-3.12-builds.patch"
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.39.2

[PATCH 10/23] python3-custom-inherit: fix python 3.12 builds

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...oneer.py-do-not-use-SafeConfigParser.patch | 29 +++++++++++++++++++
 .../python/python3-custom-inherit_2.4.1.bb    |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 meta-python/recipes-devtools/python/files/0001-versioneer.py-do-not-use-SafeConfigParser.patch

diff --git a/meta-python/recipes-devtools/python/files/0001-versioneer.py-do-not-use-SafeConfigParser.patch b/meta-python/recipes-devtools/python/files/0001-versioneer.py-do-not-use-SafeConfigParser.patch
new file mode 100644
index 000000000..34caaca98
--- /dev/null
+++ b/meta-python/recipes-devtools/python/files/0001-versioneer.py-do-not-use-SafeConfigParser.patch
@@ -0,0 +1,29 @@
+From 0920bd21ceab75bc4b655c571a37835526dd2468 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Wed, 27 Dec 2023 15:12:19 +0100
+Subject: [PATCH] versioneer.py: do not use SafeConfigParser
+
+This has been deprecated for a long time, and finally removed in python 3.12
+
+Upstream-Status: Submitted [https://github.com/rsokl/custom_inherit/pull/49]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ versioneer.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/versioneer.py b/versioneer.py
+index 64fea1c..3aa5da3 100644
+--- a/versioneer.py
++++ b/versioneer.py
+@@ -339,9 +339,9 @@ def get_config_from_root(root):
+     # configparser.NoOptionError (if it lacks "VCS="). See the docstring at
+     # the top of versioneer.py for instructions on writing your setup.cfg .
+     setup_cfg = os.path.join(root, "setup.cfg")
+-    parser = configparser.SafeConfigParser()
++    parser = configparser.ConfigParser()
+     with open(setup_cfg, "r") as f:
+-        parser.readfp(f)
++        parser.read_file(f)
+     VCS = parser.get("versioneer", "VCS")  # mandatory
+ 
+     def get(parser, name):
diff --git a/meta-python/recipes-devtools/python/python3-custom-inherit_2.4.1.bb b/meta-python/recipes-devtools/python/python3-custom-inherit_2.4.1.bb
index 478abbf1f..e7409f77e 100644
--- a/meta-python/recipes-devtools/python/python3-custom-inherit_2.4.1.bb
+++ b/meta-python/recipes-devtools/python/python3-custom-inherit_2.4.1.bb
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=f910a85a4c3da51edf780f17a7608434"
 
 PYPI_PACKAGE = "custom_inherit"
 
+SRC_URI += "file://0001-versioneer.py-do-not-use-SafeConfigParser.patch"
 SRC_URI[sha256sum] = "7052eb337bcce83551815264391cc4efc2bf70b295a3c52aba64f1ab57c3a8a2"
 
 inherit pypi setuptools3
-- 
2.39.2

[PATCH 11/23] python3-jsonrpcserver: remove

[Alexander Kanavin]

No activity in over a year, and depends on oslash, which has had no activity since 2020.

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

diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
index 0500ba19e..32e962aff 100644
--- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
+++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
@@ -210,7 +210,6 @@ RDEPENDS:packagegroup-meta-python3 = "\
     python3-jsonpath-rw \
     python3-jsonpointer \
     python3-jsonref \
-    python3-jsonrpcserver \
     python3-jsonschema \
     python3-jstyleson \
     python3-kconfiglib \
diff --git a/meta-python/recipes-devtools/python/python3-jsonrpcserver_5.0.9.bb b/meta-python/recipes-devtools/python/python3-jsonrpcserver_5.0.9.bb
deleted file mode 100644
index 7e058a757..000000000
--- a/meta-python/recipes-devtools/python/python3-jsonrpcserver_5.0.9.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY = "Library to process JSON-RPC requests"
-HOMEPAGE = "https://github.com/explodinglabs/jsonrpcserver"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=61b63ea9d36f6fb63ddaaaac8265304f"
-
-SRC_URI[sha256sum] = "a71fb2cfa18541c80935f60987f92755d94d74141248c7438847b96eee5c4482"
-
-inherit pypi setuptools3
-
-RDEPENDS:${PN} += "\
-    python3-apply-defaults \
-    python3-asyncio \
-    python3-core \
-    python3-json \
-    python3-jsonschema \
-    python3-logging \
-    python3-netclient \
-    python3-pkgutil \
-    python3-oslash \
-    python3-typing-extensions \
-"
-
-BBCLASSEXTEND = "native nativesdk"
-- 
2.39.2

[PATCH 12/23] python3-oslash: remove

[Alexander Kanavin]

Not compatible with python 3.12; dead upstream (no activity since 2020).

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../python/python3-oslash_0.6.3.bb            | 22 -------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python3-oslash_0.6.3.bb

diff --git a/meta-python/recipes-devtools/python/python3-oslash_0.6.3.bb b/meta-python/recipes-devtools/python/python3-oslash_0.6.3.bb
deleted file mode 100644
index b926484db..000000000
--- a/meta-python/recipes-devtools/python/python3-oslash_0.6.3.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "Functors, Applicatives, And Monads in Python"
-HOMEPAGE = "https://github.com/dbrattli/oslash"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://README.md;md5=ed79d2637878dfe97de89e357b5c02dd"
-
-DEPENDS += "\
-    ${PYTHON_PN}-pip-native \
-    ${PYTHON_PN}-pytest-runner-native\
-"
-
-SRC_URI[sha256sum] = "868aeb58a656f2ed3b73d9dd6abe387b20b74fc9413d3e8653b615b15bf728f3"
-
-PYPI_PACKAGE = "OSlash"
-
-inherit pypi setuptools3
-
-RDEPENDS:${PN} += " \
-    python3-json \
-    python3-typing-extensions \
-"
-
-BBCLASSEXTEND = "native nativesdk"
-- 
2.39.2

[PATCH 13/23] nmap: disable ndiff

[Alexander Kanavin]

In 7.80 this requires distutils (no longer provided in python 3.12).
This may be resolved in newer nmap versions, so if you care about it
please provide a version update: https://nmap.org/dist/

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta-oe/recipes-security/nmap/nmap_7.80.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-security/nmap/nmap_7.80.bb b/meta-oe/recipes-security/nmap/nmap_7.80.bb
index 52c62cde3..f9fe82a91 100644
--- a/meta-oe/recipes-security/nmap/nmap_7.80.bb
+++ b/meta-oe/recipes-security/nmap/nmap_7.80.bb
@@ -19,7 +19,7 @@ SRC_URI[sha256sum] = "fcfa5a0e42099e12e4bf7a68ebe6fde05553383a682e816a7ec9256ab4
 
 inherit autotools-brokensep pkgconfig python3native
 
-PACKAGECONFIG ?= "ncat nping ndiff pcap"
+PACKAGECONFIG ?= "ncat nping pcap"
 
 PACKAGECONFIG[pcap] = "--with-pcap=linux, --without-pcap, libpcap, libpcap"
 PACKAGECONFIG[pcre] = "--with-libpcre=${STAGING_LIBDIR}/.., --with-libpcre=included, libpcre"
-- 
2.39.2

[PATCH 14/23] wireshark: update 4.0.10 -> 4.2.0

[Alexander Kanavin]

This resolves python 3.12 issues.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...-a-try_run-test-when-cross-compiling.patch | 66 --------------
 ...-do-not-use-lemon-data-from-the-host.patch | 32 +++++++
 ...ireshark-src-improve-reproducibility.patch | 16 ++--
 .../0002-flex-Remove-line-directives.patch    | 14 ++-
 .../0004-lemon-Remove-line-directives.patch   | 87 +++++--------------
 ...wireshark_4.0.10.bb => wireshark_4.2.0.bb} |  6 +-
 6 files changed, 73 insertions(+), 148 deletions(-)
 delete mode 100644 meta-networking/recipes-support/wireshark/files/0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch
 create mode 100644 meta-networking/recipes-support/wireshark/files/0001-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch
 rename meta-networking/recipes-support/wireshark/{wireshark_4.0.10.bb => wireshark_4.2.0.bb} (94%)

diff --git a/meta-networking/recipes-support/wireshark/files/0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch b/meta-networking/recipes-support/wireshark/files/0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch
deleted file mode 100644
index 0d51ce1b8..000000000
--- a/meta-networking/recipes-support/wireshark/files/0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From b4f29807225cf3744c2f4f971902fbdd7486fc19 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= <j@v6e.pt>
-Date: Fri, 26 May 2023 13:29:23 +0100
-Subject: [PATCH] CMake: Fix a try_run() test when cross-compiling
-
-Upstream-Status: Backport
-Signed-off-by: Armin Kuster <akuster808@gmail.com>
-
----
- ConfigureChecks.cmake | 36 ++++++++++++++++++++----------------
- 1 file changed, 20 insertions(+), 16 deletions(-)
-
-diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
-index dd8268e077..d8bca54115 100644
---- a/ConfigureChecks.cmake
-+++ b/ConfigureChecks.cmake
-@@ -122,26 +122,30 @@ check_type_size("ssize_t"       SSIZE_T)
- # Check if the libc vsnprintf() conforms to C99. If this fails we may
- # need to fall-back on GLib I/O.
- #
--check_c_source_runs("
--	#include <stdio.h>
--	int main(void)
--	{
--		/* Check that snprintf() and vsnprintf() don't return
--		 * -1 if the buffer is too small. C99 says this value
--		 * is the length that would be written not including
--		 * the nul byte. */
--		char buf[3];
--		return snprintf(buf, sizeof(buf), \"%s\", \"ABCDEF\") > 0 ? 0 : 1;
--	}"
--	HAVE_C99_VSNPRINTF
--)
--if (NOT HAVE_C99_VSNPRINTF)
--	message(FATAL_ERROR
-+# If cross-compiling we can't check so just assume this requirement is met.
-+#
-+if(NOT CMAKE_CROSSCOMPILING)
-+	check_c_source_runs("
-+		#include <stdio.h>
-+		int main(void)
-+		{
-+			/* Check that snprintf() and vsnprintf() don't return
-+			* -1 if the buffer is too small. C99 says this value
-+			* is the length that would be written not including
-+			* the nul byte. */
-+			char buf[3];
-+			return snprintf(buf, sizeof(buf), \"%s\", \"ABCDEF\") > 0 ? 0 : 1;
-+		}"
-+		HAVE_C99_VSNPRINTF
-+	)
-+	if (NOT HAVE_C99_VSNPRINTF)
-+		message(FATAL_ERROR
- "Building Wireshark requires a C99 compliant vsnprintf() and this \
- target does not meet that requirement. Compiling for ${CMAKE_SYSTEM} \
- using ${CMAKE_C_COMPILER_ID}. Please report this issue to the Wireshark \
- developers at wireshark-dev@wireshark.org."
--	)
-+		)
-+	endif()
- endif()
- 
- #
--- 
-2.25.1
-
diff --git a/meta-networking/recipes-support/wireshark/files/0001-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch b/meta-networking/recipes-support/wireshark/files/0001-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch
new file mode 100644
index 000000000..1903f38f5
--- /dev/null
+++ b/meta-networking/recipes-support/wireshark/files/0001-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch
@@ -0,0 +1,32 @@
+From 802d3cafa888b36aa72007d48232a010dbb0231d Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Wed, 27 Dec 2023 16:57:28 +0100
+Subject: [PATCH] UseLemon.cmake: do not use lemon data from the host
+
+We use native lemon, and not the host one, so
+the data should be taken from the source tree as well.
+
+Upstream-Status: Inappropriate [cross-specific]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ cmake/modules/UseLemon.cmake | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/modules/UseLemon.cmake b/cmake/modules/UseLemon.cmake
+index fa4034e..83a7ca3 100644
+--- a/cmake/modules/UseLemon.cmake
++++ b/cmake/modules/UseLemon.cmake
+@@ -13,11 +13,12 @@ if(LEMON_EXECUTABLE)
+ 				${_out}.out
+ 			COMMAND ${LEMON_EXECUTABLE}
+ 				-l
+-				-T/usr/share/lemon/lempar.c
++				-T${CMAKE_SOURCE_DIR}/tools/lemon/lempar.c
+ 				-d.
+ 				${_in}
+ 			DEPENDS
+ 				${_in}
++				${CMAKE_SOURCE_DIR}/tools/lemon/lempar.c
+ 		)
+ 	endmacro()
+ 	add_custom_target(lemon)
diff --git a/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch b/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch
index 6ad8a62c2..202de6260 100644
--- a/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch
+++ b/meta-networking/recipes-support/wireshark/files/0001-wireshark-src-improve-reproducibility.patch
@@ -1,4 +1,4 @@
-From 0a9ab056ce7582033a21d6bc541ece520bf2b0b6 Mon Sep 17 00:00:00 2001
+From d9c4cdad0c48becab491ea4e80e5cd81f7d1dc97 Mon Sep 17 00:00:00 2001
 From: Oleksiy Obitotskyy <oobitots@cisco.com>
 Date: Thu, 26 Nov 2020 05:38:31 -0800
 Subject: [PATCH] wireshark-src: improve reproducibility
@@ -8,15 +8,15 @@ comments.
 
 Upstream-Status: Pending
 Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com>
+
 ---
- tools/make-plugin-reg.py | 2 +-
- tools/ncp2222.py         | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ tools/ncp2222.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: wireshark-4.0.6/tools/ncp2222.py
-===================================================================
---- wireshark-4.0.6.orig/tools/ncp2222.py
-+++ wireshark-4.0.6/tools/ncp2222.py
+diff --git a/tools/ncp2222.py b/tools/ncp2222.py
+index f14d0c5..05073b9 100755
+--- a/tools/ncp2222.py
++++ b/tools/ncp2222.py
 @@ -5891,7 +5891,7 @@ def produce_code():
  
      print("/*")
diff --git a/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch b/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch
index 069b5793d..0e6249c93 100644
--- a/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch
+++ b/meta-networking/recipes-support/wireshark/files/0002-flex-Remove-line-directives.patch
@@ -1,4 +1,4 @@
-From 3e571e24c730f747d18ed02ba7451e9e00480fc7 Mon Sep 17 00:00:00 2001
+From e4e88c2f55286cf24af230b265d0e059363baa6c Mon Sep 17 00:00:00 2001
 From: Oleksiy Obitotskyy <oobitots@cisco.com>
 Date: Thu, 26 Nov 2020 12:00:43 -0800
 Subject: [PATCH] flex: Remove #line directives
@@ -8,12 +8,13 @@ generate #line directives with absolute file patch.
 
 Upstream-Status: Pending
 Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com>
+
 ---
  cmake/modules/FindLEX.cmake | 18 +++++++++++++-----
  1 file changed, 13 insertions(+), 5 deletions(-)
 
 diff --git a/cmake/modules/FindLEX.cmake b/cmake/modules/FindLEX.cmake
-index 0008bc4..ec68f84 100644
+index 20caa09..174f452 100644
 --- a/cmake/modules/FindLEX.cmake
 +++ b/cmake/modules/FindLEX.cmake
 @@ -32,11 +32,19 @@ MACRO(ADD_LEX_FILES _source _generated)
@@ -22,25 +23,22 @@ index 0008bc4..ec68f84 100644
  
 -      ADD_CUSTOM_COMMAND(
 -        OUTPUT ${_outc} ${_outh}
--        COMMAND ${LEX_EXECUTABLE} -o${_outc} --header-file=${_outh} ${_in}
+-        COMMAND ${LEX_EXECUTABLE} $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:--debug> -o${_outc} --header-file=${_outh} ${_in}
 -        DEPENDS ${_in}
 -      )
 +      IF (DEFINED ENV{SOURCE_DATE_EPOCH})
 +        ADD_CUSTOM_COMMAND(
 +          OUTPUT ${_outc} ${_outh}
-+          COMMAND ${LEX_EXECUTABLE} --noline -o${_outc} --header-file=${_outh} ${_in}
++          COMMAND ${LEX_EXECUTABLE} $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:--debug> --noline -o${_outc} --header-file=${_outh} ${_in}
 +          DEPENDS ${_in}
 +        )
 +      ELSE ()
 +        ADD_CUSTOM_COMMAND(
 +          OUTPUT ${_outc} ${_outh}
-+          COMMAND ${LEX_EXECUTABLE} -o${_outc} --header-file=${_outh} ${_in}
++          COMMAND ${LEX_EXECUTABLE} $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:--debug> -o${_outc} --header-file=${_outh} ${_in}
 +          DEPENDS ${_in}
 +        )
 +      ENDIF ()
        LIST(APPEND ${_source} ${_in})
        LIST(APPEND ${_generated} ${_outc})
        INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
--- 
-2.26.2.Cisco
-
diff --git a/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch b/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch
index 134633f66..1a6fe8d39 100644
--- a/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch
+++ b/meta-networking/recipes-support/wireshark/files/0004-lemon-Remove-line-directives.patch
@@ -1,4 +1,4 @@
-From 17f05a8d02c589e4867906f70381e63e46a67870 Mon Sep 17 00:00:00 2001
+From 94b951c0cccf67b66749cc87c473e63fa5207e83 Mon Sep 17 00:00:00 2001
 From: Oleksiy Obitotskyy <oobitots@cisco.com>
 Date: Wed, 27 Jan 2021 06:47:13 -0800
 Subject: [PATCH] lemon: Remove #line directives
@@ -8,67 +8,28 @@ directives with extra option '-l'.
 
 Upstream-Status: Pending
 Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com>
+
 ---
- cmake/modules/UseLemon.cmake | 49 +++++++++++++++++++++++++-----------
- 1 file changed, 34 insertions(+), 15 deletions(-)
+ cmake/modules/UseLemon.cmake | 2 ++
+ 1 file changed, 2 insertions(+)
 
-Index: wireshark-3.4.11/cmake/modules/UseLemon.cmake
-===================================================================
---- wireshark-3.4.11.orig/cmake/modules/UseLemon.cmake
-+++ wireshark-3.4.11/cmake/modules/UseLemon.cmake
-@@ -7,21 +7,40 @@ MACRO(ADD_LEMON_FILES _source _generated
- 
-       SET(_out ${CMAKE_CURRENT_BINARY_DIR}/${_basename})
- 
--      ADD_CUSTOM_COMMAND(
--         OUTPUT
--          ${_out}.c
--          # These files are generated as side-effect
--          ${_out}.h
--          ${_out}.out
--         COMMAND $<TARGET_FILE:lemon>
--           -T${_lemonpardir}/lempar.c
--           -d.
--           ${_in}
--         DEPENDS
--           ${_in}
--           lemon
--           ${_lemonpardir}/lempar.c
--      )
-+      IF (DEFINED ENV{SOURCE_DATE_EPOCH})
-+        ADD_CUSTOM_COMMAND(
-+          OUTPUT
-+            ${_out}.c
-+            # These files are generated as side-effect
-+            ${_out}.h
-+            ${_out}.out
-+          COMMAND lemon
-+            -l
-+            -T${_lemonpardir}/lempar.c
-+            -d.
-+            ${_in}
-+          DEPENDS
-+            ${_in}
-+            lemon
-+            ${_lemonpardir}/lempar.c
-+        )
-+      ELSE ()
-+        ADD_CUSTOM_COMMAND(
-+          OUTPUT
-+            ${_out}.c
-+            # These files are generated as side-effect
-+            ${_out}.h
-+            ${_out}.out
-+          COMMAND lemon
-+            -T${_lemonpardir}/lempar.c
-+            -d.
-+            ${_in}
-+          DEPENDS
-+            ${_in}
-+            lemon
-+            ${_lemonpardir}/lempar.c
-+        )
-+      ENDIF ()
- 
-       LIST(APPEND ${_source} ${_in})
-       LIST(APPEND ${_generated} ${_out}.c)
+diff --git a/cmake/modules/UseLemon.cmake b/cmake/modules/UseLemon.cmake
+index e419de1..fa4034e 100644
+--- a/cmake/modules/UseLemon.cmake
++++ b/cmake/modules/UseLemon.cmake
+@@ -12,6 +12,7 @@ if(LEMON_EXECUTABLE)
+ 				${_out}.h
+ 				${_out}.out
+ 			COMMAND ${LEMON_EXECUTABLE}
++				-l
+ 				-T/usr/share/lemon/lempar.c
+ 				-d.
+ 				${_in}
+@@ -30,6 +31,7 @@ else()
+ 				${_out}.h
+ 				${_out}.out
+ 			COMMAND $<TARGET_FILE:lemon>
++				-l
+ 				-T${CMAKE_SOURCE_DIR}/tools/lemon/lempar.c
+ 				-d.
+ 				${_in}
diff --git a/meta-networking/recipes-support/wireshark/wireshark_4.0.10.bb b/meta-networking/recipes-support/wireshark/wireshark_4.2.0.bb
similarity index 94%
rename from meta-networking/recipes-support/wireshark/wireshark_4.0.10.bb
rename to meta-networking/recipes-support/wireshark/wireshark_4.2.0.bb
index 008aa8cb1..4a4768092 100644
--- a/meta-networking/recipes-support/wireshark/wireshark_4.0.10.bb
+++ b/meta-networking/recipes-support/wireshark/wireshark_4.2.0.bb
@@ -4,20 +4,20 @@ SECTION = "net"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-DEPENDS = "pcre2 expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native c-ares"
+DEPENDS = "pcre2 expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native c-ares speexdsp"
 
 DEPENDS:append:class-target = " wireshark-native chrpath-replacement-native "
 
 SRC_URI = "https://1.eu.dl.wireshark.org/src/wireshark-${PV}.tar.xz \
-           file://0001-CMake-Fix-a-try_run-test-when-cross-compiling.patch \
            file://0001-wireshark-src-improve-reproducibility.patch \
            file://0002-flex-Remove-line-directives.patch \
            file://0004-lemon-Remove-line-directives.patch \
+           file://0001-UseLemon.cmake-do-not-use-lemon-data-from-the-host.patch \
            "
 
 UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src"
 
-SRC_URI[sha256sum] = "b2e3ff03fa2be9058a9ffbedd12b0a670433bd16c8cc6c432ab48dabc2df1898"
+SRC_URI[sha256sum] = "0e428492f4c3625d61a7ccff008dc0e429d16ab8caccad4403157ea92b48a75b"
 
 PE = "1"
 
-- 
2.39.2

[PATCH 15/23] openipmi: update 2.0.32 -> 2.0.34

[Alexander Kanavin]

This resolves dependency on removed python distutils in particular.

openipmi-remove-host-path-from-la_LDFLAGS.patch is removed
as issue is fixed upstream.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ..._devel.m4-do-not-check-for-distutils.patch | 41 ----------------
 ...fix-symlink-install-error-in-cmdlang.patch |  9 ++--
 .../openipmi/files/include_sys_types.patch    |  5 +-
 .../files/ipmi-init-fix-the-arguments.patch   |  6 +--
 .../files/openipmi-no-openipmigui-man.patch   |  3 +-
 ...pmi-remove-host-path-from-la_LDFLAGS.patch | 49 -------------------
 ...{openipmi_2.0.32.bb => openipmi_2.0.34.bb} | 12 ++---
 7 files changed, 16 insertions(+), 109 deletions(-)
 delete mode 100644 meta-networking/recipes-support/openipmi/files/0001-m4-ax_python_devel.m4-do-not-check-for-distutils.patch
 delete mode 100644 meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch
 rename meta-networking/recipes-support/openipmi/{openipmi_2.0.32.bb => openipmi_2.0.34.bb} (87%)

diff --git a/meta-networking/recipes-support/openipmi/files/0001-m4-ax_python_devel.m4-do-not-check-for-distutils.patch b/meta-networking/recipes-support/openipmi/files/0001-m4-ax_python_devel.m4-do-not-check-for-distutils.patch
deleted file mode 100644
index 00956fb11..000000000
--- a/meta-networking/recipes-support/openipmi/files/0001-m4-ax_python_devel.m4-do-not-check-for-distutils.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 3a35611687864cf3599712d0d2ff54532b0118ac Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Sun, 3 Oct 2021 21:42:32 +0200
-Subject: [PATCH] m4/ax_python_devel.m4: do not check for distutils
-
-With py 3.10 this prints a deprecation warning which is
-taken as an error. Upstream should rework the code to not
-use distuils.
-
-Upstream-Status: Inappropriate [needs a proper fix upstream]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- m4/ax_python_devel.m4 | 15 ---------------
- 1 file changed, 15 deletions(-)
-
-diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4
-index e0804c5..cfc0b24 100644
---- a/m4/ax_python_devel.m4
-+++ b/m4/ax_python_devel.m4
-@@ -138,21 +138,6 @@ variable to configure. See ``configure --help'' for reference.
- 		fi
- 	fi
- 
--	#
--	# Check if you have distutils, else fail
--	#
--	AC_MSG_CHECKING([for the distutils Python package])
--	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
--	if test -z "$ac_distutils_result"; then
--		AC_MSG_RESULT([yes])
--	else
--		AC_MSG_RESULT([no])
--		AC_MSG_ERROR([cannot import Python module "distutils".
--Please check your Python installation. The error was:
--$ac_distutils_result])
--		PYTHON_VERSION=""
--	fi
--
- 	#
- 	# Check for Python include path
- 	#
diff --git a/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch b/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch
index 243488424..5bbccdcbf 100644
--- a/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch
+++ b/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch
@@ -1,4 +1,4 @@
-From 7854c60c92243adb14ea89e16fc226d2e47dd4f9 Mon Sep 17 00:00:00 2001
+From 0ccfefe624e25f937b27b2caf3671e80c2c29391 Mon Sep 17 00:00:00 2001
 From: Aws Ismail <aws.ismail@windriver.com>
 Date: Thu, 7 Jun 2012 16:00:13 -0400
 Subject: [PATCH] Fix symlink install error in cmdlang
@@ -9,17 +9,18 @@ creating a symbolic link for opeipmish in openipmi/cmdlang
 Upstream-Status: Pending
 
 Signed-off-by: Aws Ismail <aws.ismail@windriver.com>
+
 ---
  cmdlang/Makefile.am | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am
-index 0ca3827..d9a941f 100644
+index 7235446..4a81ae3 100644
 --- a/cmdlang/Makefile.am
 +++ b/cmdlang/Makefile.am
-@@ -35,6 +35,7 @@ openipmish_LDADD =  libOpenIPMIcmdlang.la \
+@@ -41,6 +41,7 @@ openipmish_CFLAGS = -Wall -Wsign-compare -I$(top_builddir)/include \
  # compatability.
- install-data-local:
+ install-exec-hook:
  	rm -f $(DESTDIR)$(bindir)/ipmish
 +	mkdir -p $(DESTDIR)$(bindir)/
  	$(LN_S) openipmish $(DESTDIR)$(bindir)/ipmish
diff --git a/meta-networking/recipes-support/openipmi/files/include_sys_types.patch b/meta-networking/recipes-support/openipmi/files/include_sys_types.patch
index 61b39995a..18129e6fc 100644
--- a/meta-networking/recipes-support/openipmi/files/include_sys_types.patch
+++ b/meta-networking/recipes-support/openipmi/files/include_sys_types.patch
@@ -1,4 +1,4 @@
-From 4f41e090e33a00117a27f0c77b6338fb8b495f37 Mon Sep 17 00:00:00 2001
+From d667aedc37aeabdb9f8574ee0b9cf85b844ca2d2 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 2 Jun 2017 21:58:32 -0700
 Subject: [PATCH] openipmi: Fix build with musl
@@ -12,12 +12,13 @@ ui.c:340:5: error: unknown type name 'u_int32_t'; did you mean 'uint32_t'?
 Upstream-Status: Pending
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
 ---
  ui/ui.c | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/ui/ui.c b/ui/ui.c
-index 529ff22..066d118 100644
+index 9c6a51f..34f7e34 100644
 --- a/ui/ui.c
 +++ b/ui/ui.c
 @@ -42,6 +42,7 @@
diff --git a/meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch b/meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch
index c4559c97b..d9ee5cc28 100644
--- a/meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch
+++ b/meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch
@@ -1,4 +1,4 @@
-From 6542ebe7a0d37dee8e9afb856feb8f6c3d334632 Mon Sep 17 00:00:00 2001
+From 7d9f6526dbcd46130d279c363d38781969807f74 Mon Sep 17 00:00:00 2001
 From: Jackie Huang <jackie.huang@windriver.com>
 Date: Mon, 29 Dec 2014 18:16:04 +0800
 Subject: [PATCH] ipmi-init: fix the arguments
@@ -10,12 +10,13 @@ not a string.
 Upstream-Status: Inappropriate [OE specific]
 
 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+
 ---
  ipmi.init | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/ipmi.init b/ipmi.init
-index ea10b11..aac9f83 100644
+index bd80f0d..53305bb 100644
 --- a/ipmi.init
 +++ b/ipmi.init
 @@ -45,17 +45,17 @@ elif [ -r /etc/init.d/functions ]; then
@@ -39,4 +40,3 @@ index ea10b11..aac9f83 100644
  		echo
  		;;
  	    *)
-
diff --git a/meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch b/meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch
index 858adc50a..f14626a38 100644
--- a/meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch
+++ b/meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch
@@ -1,4 +1,4 @@
-From a6ffa3939a3ab2ad6a8d277cd8292b7dad6469c6 Mon Sep 17 00:00:00 2001
+From c76e727433ed895c605f9e7a3612bbc16ff558de Mon Sep 17 00:00:00 2001
 From: Aws Ismail <aws.ismail@windriver.com>
 Date: Thu, 7 Jun 2012 12:28:34 -0400
 Subject: [PATCH] Do not build openipmigui man page
@@ -11,6 +11,7 @@ Upstream-Status: Pending
 
 Signed-off-by: Aws Ismail <aws.ismail@windriver.com>
 Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+
 ---
  man/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch b/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch
deleted file mode 100644
index 1aea32eae..000000000
--- a/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 5a4abf223d79d4e1a58bbad1e4f2f406c7cab748 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Mon, 29 Dec 2014 18:16:04 +0800
-Subject: [PATCH] remove host path from la_LDFLAGS
-
-Upstream-Status: Inappropriate [ cross compile specific ]
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- cmdlang/Makefile.am | 2 +-
- unix/Makefile.am    | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am
-index 9cf180d..da46ceb 100644
---- a/cmdlang/Makefile.am
-+++ b/cmdlang/Makefile.am
-@@ -18,7 +18,7 @@ libOpenIPMIcmdlang_la_LIBADD = -lm \
- 	$(top_builddir)/utils/libOpenIPMIutils.la \
- 	$(top_builddir)/lib/libOpenIPMI.la
- libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
--	-L$(libdir) -no-undefined
-+	-no-undefined
- 
- bin_PROGRAMS = openipmish
- 
-diff --git a/unix/Makefile.am b/unix/Makefile.am
-index baf0815..80c3d5d 100644
---- a/unix/Makefile.am
-+++ b/unix/Makefile.am
-@@ -11,13 +11,13 @@ libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c
- libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \
- 	$(top_builddir)/utils/libOpenIPMIutils.la $(RT_LIB)
- libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
--	-L$(libdir) -no-undefined
-+	-no-undefined
- 
- libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c
- libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \
- 	$(GDBM_LIB) $(RT_LIB)
- libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
--	-L$(libdir) -no-undefined
-+	-no-undefined
- 
- noinst_HEADERS = heap.h
- 
--- 
-2.17.1
-
diff --git a/meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb b/meta-networking/recipes-support/openipmi/openipmi_2.0.34.bb
similarity index 87%
rename from meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb
rename to meta-networking/recipes-support/openipmi/openipmi_2.0.34.bb
index 18f4deca1..470ce1e25 100644
--- a/meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb
+++ b/meta-networking/recipes-support/openipmi/openipmi_2.0.34.bb
@@ -26,27 +26,22 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \
            file://fix-symlink-install-error-in-cmdlang.patch \
            file://openipmi-no-openipmigui-man.patch \
-           file://openipmi-remove-host-path-from-la_LDFLAGS.patch \
            file://ipmi-init-fix-the-arguments.patch \
            file://include_sys_types.patch \
            file://openipmi-helper \
            file://ipmi.service \
-           file://0001-m4-ax_python_devel.m4-do-not-check-for-distutils.patch \
            "
 
 S = "${WORKDIR}/OpenIPMI-${PV}"
 
-SRC_URI[md5sum] = "532404c9df7d0e8bde975b95b9e6775b"
-SRC_URI[sha256sum] = "f6d0fd4c0a74b05f80907229d0b270f54ca23294bcc11979f8b8d12766786945"
+SRC_URI[sha256sum] = "93227e43c72b5c3bd5949323e0669aa5527d1a971473a3a365af03fb8284a95f"
 
-inherit autotools-brokensep pkgconfig python3native perlnative update-rc.d systemd cpan-base python3targetconfig
+inherit autotools-brokensep pkgconfig perlnative update-rc.d systemd cpan-base python3targetconfig
 
 CFLAGS += "-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
 
 EXTRA_OECONF = "--disable-static \
                 --with-perl='${STAGING_BINDIR_NATIVE}/perl-native/perl' \
-                --with-python='${STAGING_BINDIR_NATIVE}/python3-native/python3' \
-                --with-pythoninstall='${PYTHON_SITEPACKAGES_DIR}' \
                 --with-glibver=2.0"
 
 PACKAGECONFIG ??= "gdbm"
@@ -68,9 +63,8 @@ FILES:${PN}-dbg += " \
     "
 
 do_configure () {
-
     # Let's perform regular configuration first then handle perl issues.
-    autotools_do_configure
+    PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} autotools_do_configure
 
     perl_ver=`perl -V:version | cut -d\' -f 2`
     
-- 
2.39.2

[PATCH 16/23] libsigrokdecode: add python 3.12 support

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch b/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch
index a90f588d2..45556afa8 100644
--- a/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch
+++ b/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch
@@ -18,7 +18,7 @@ index 4802f35..e0e468f 100644
  # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build
  SR_PKG_CHECK([python3], [SRD_PKGLIBS],
 -	[python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2])
-+	[python-3.11-embed], [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2])
++	[python-3.12-embed], [python-3.11-embed], [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2])
  AS_IF([test "x$sr_have_python3" = xno],
  	[AC_MSG_ERROR([Cannot find Python 3 development headers.])])
  
-- 
2.39.2

[PATCH 17/23] cockpit: add setuptools dependency to bring in distutils copy

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb
index ab05fd377..df7f47a11 100644
--- a/meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb
+++ b/meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb
@@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "a87d090c930e2058bb3e970ca7f2bafe678687966b5c0b8b42a802977e
 inherit gettext pkgconfig autotools systemd features_check
 inherit ${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3targetconfig', d)}
 
-DEPENDS += "glib-2.0-native intltool-native gnutls virtual/gettext json-glib krb5 libpam systemd"
+DEPENDS += "glib-2.0-native intltool-native gnutls virtual/gettext json-glib krb5 libpam systemd python3-setuptools-native"
 DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3-pip-native', d)}"
 
 COMPATIBLE_HOST:libc-musl = "null"
-- 
2.39.2

[PATCH 18/23] mongodb: skip until python 3.12 fixes are available.

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../meta-python/recipes-dbs/mongodb/mongodb_git.bb              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb
index 037d58cf1..ee5c77a85 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb
+++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb
@@ -145,3 +145,5 @@ SYSTEMD_SERVICE:${PN} = "mongod.service"
 FILES:${PN} += "${nonarch_libdir}/tmpfiles.d"
 
 RDEPENDS:${PN} += "tzdata-core"
+
+SKIP_RECIPE[mongodb] ?= "Needs porting to python 3.12"
-- 
2.39.2

Re: [PATCH 18/23] mongodb: skip until python 3.12 fixes are available.

[Joao Marcos Costa]

Hello Alexander,

On 12/31/23 13:23, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>   .../meta-python/recipes-dbs/mongodb/mongodb_git.bb              | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb
> index 037d58cf1..ee5c77a85 100644
> --- a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb
> +++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb
> @@ -145,3 +145,5 @@ SYSTEMD_SERVICE:${PN} = "mongod.service"
>   FILES:${PN} += "${nonarch_libdir}/tmpfiles.d"
>   
>   RDEPENDS:${PN} += "tzdata-core"
> +
> +SKIP_RECIPE[mongodb] ?= "Needs porting to python 3.12"


Would you have any updates on this porting?

As of now, skipping mongodb is raising some warnings in YP Autobuilder:

https://autobuilder.yoctoproject.org/typhoon/#/builders/156/builds/206/steps/12/logs/warnings

and 
https://autobuilder.yoctoproject.org/typhoon/#/builders/156/builds/193/steps/12/logs/warnings


-- 
Best regards,
João Marcos Costa

Re: [PATCH 18/23] mongodb: skip until python 3.12 fixes are available.

[Alexander Kanavin]

On Tue, 16 Jan 2024 at 10:24, Joao Marcos Costa
<joaomarcos.costa@bootlin.com> wrote:
> Would you have any updates on this porting?

I wouldn't and I don't plan to fix it. Mongodb is under a proprietary
license that OSI rejected and thus in my opinion doesn't belong in
meta-oe at all.

If it's important to you, then you need to do the work.

Alex

Re: [oe] [PATCH 18/23] mongodb: skip until python 3.12 fixes are available.

[Yoann Congal]

Hello,

Le 16/01/2024 à 10:30, Alexander Kanavin a écrit :
> On Tue, 16 Jan 2024 at 10:24, Joao Marcos Costa
> <joaomarcos.costa@bootlin.com> wrote:
>> Would you have any updates on this porting?
> 
> I wouldn't and I don't plan to fix it. Mongodb is under a proprietary
> license that OSI rejected and thus in my opinion doesn't belong in
> meta-oe at all.
> 
> If it's important to you, then you need to do the work.

FYI, I've sent a patch removing mongodb from the packagegroup:
https://lists.openembedded.org/g/openembedded-devel/message/108306

Regards,

-- 
Yoann Congal
Smile ECS - Tech Expert

Re: [PATCH 18/23] mongodb: skip until python 3.12 fixes are available.

[Vincent Prince]

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

Hello

It seems to compile with this patch

diff --git a/buildscripts/moduleconfig.py b/buildscripts/moduleconfig.py
index b4d0bba0490..73c0f1a03fa 100644
--- a/buildscripts/moduleconfig.py
+++ b/buildscripts/moduleconfig.py
@@ -27,7 +27,7 @@ MongoDB SConscript files do.
__all__ = ('discover_modules', 'discover_module_directories', 'configure_modules',
'register_module_test')  # pylint: disable=undefined-all-variable

-import imp
+import importlib
import inspect
import os

@@ -71,7 +71,7 @@ def discover_modules(module_root, allowed_modules):
print("adding module: %s" % (name))
fp = open(build_py, "r")
try:
-                module = imp.load_module("module_" + name, fp, build_py,
+                module = importlib.import_module("module_" + name, fp, build_py,
(".py", "r", imp.PY_SOURCE))
if getattr(module, "name", None) is None:
module.name = name
--
2.34.1

I'm not that confident about it but if it helps :)

Best regards,

Vincent

[-- Attachment #2: Type: text/html, Size: 1756 bytes --]

[PATCH 19/23] mercurial: ensure setuptools is present as distutils is no longer (mercurial tries both)

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta-oe/recipes-devtools/mercurial/mercurial_6.5.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-devtools/mercurial/mercurial_6.5.bb b/meta-oe/recipes-devtools/mercurial/mercurial_6.5.bb
index 112df8c1e..2451a36be 100644
--- a/meta-oe/recipes-devtools/mercurial/mercurial_6.5.bb
+++ b/meta-oe/recipes-devtools/mercurial/mercurial_6.5.bb
@@ -4,7 +4,7 @@ SECTION = "console/utils"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-DEPENDS = "python3 python3-native"
+DEPENDS = "python3 python3-native python3-setuptools-native"
 RDEPENDS:${PN} = "python3 python3-modules"
 
 inherit python3native python3targetconfig
-- 
2.39.2

[PATCH 20/23] rwmem: fix python modules packaging

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb b/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb
index 8ccdc27a8..bff82fe35 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb
+++ b/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb
@@ -32,4 +32,4 @@ do_install:append() {
 	install -D -m 0644 ${B}/librwmem/librwmem.a ${D}${libdir}/librwmem.a
 }
 
-FILES:${PN} += "${libdir}/python3.11/site-packages/pyrwmem"
+FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}/pyrwmem"
-- 
2.39.2

[PATCH 21/23] upm: get disutils copy via setuptools

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta-oe/recipes-extended/upm/upm_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-extended/upm/upm_git.bb b/meta-oe/recipes-extended/upm/upm_git.bb
index 0695f9969..a86f4a80d 100644
--- a/meta-oe/recipes-extended/upm/upm_git.bb
+++ b/meta-oe/recipes-extended/upm/upm_git.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=66493d54e65bfc12c7983ff2e884f37f"
 
-DEPENDS = "libjpeg-turbo mraa"
+DEPENDS = "libjpeg-turbo mraa python3-setuptools-native"
 
 SRCREV = "5cf20df96c6b35c19d5b871ba4e319e96b4df72d"
 PV = "2.0.0+git${SRCPV}"
-- 
2.39.2

[PATCH 22/23] python3-kmod: remove the recipe

[Alexander Kanavin]

Not compatible with cython 3.x, and has been inactive for years:
https://pypi.org/project/kmod/#description
https://github.com/agrover/python-kmod

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

diff --git a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
index 32e962aff..41fce5327 100644
--- a/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
+++ b/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb
@@ -217,7 +217,6 @@ RDEPENDS:packagegroup-meta-python3 = "\
     python3-keras-preprocessing \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11 opengl", "python3-kivy", "", d)} \
     python3-kiwisolver \
-    python3-kmod \
     python3-langtable \
     python3-lazy-object-proxy \
     python3-libconf \
diff --git a/meta-python/recipes-devtools/python/python3-kmod_0.9.1.bb b/meta-python/recipes-devtools/python/python3-kmod_0.9.1.bb
deleted file mode 100644
index 52e1cf6af..000000000
--- a/meta-python/recipes-devtools/python/python3-kmod_0.9.1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY = "Python bindings for kmod/libkmod."
-HOMEPAGE = "https://github.com/agrover/python-kmod"
-SECTION = "devel/python"
-LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6d62c2454850386a2ffe44f72db83d74"
-
-inherit pypi setuptools3
-
-RECIPE_NO_UPDATE_REASON = "Version 0.9.2 is broken when using latest build machinery for C extensions"
-SRC_URI[sha256sum] = "f3bf829059bf88eca22f4f549e17aa316cdaa14302bf2ba49ddeee60cea109ff"
-
-DEPENDS += " \
-    kmod \
-    python3-cython-native \
-"
-- 
2.39.2

[PATCH 23/23] hplip: provide setuptools for the distutils copy

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta-oe/recipes-extended/hplip/hplip_3.22.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb b/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb
index ed9f28e07..be420b483 100644
--- a/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb
+++ b/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb
@@ -19,7 +19,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \
            file://0001-Drop-using-register-storage-classifier.patch"
 SRC_URI[sha256sum] = "533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624"
 
-DEPENDS += "cups python3 libusb1"
+DEPENDS += "cups python3 libusb1 python3-setuptools-native"
 
 inherit autotools-brokensep python3-dir python3native python3targetconfig pkgconfig systemd
 
-- 
2.39.2