I am seeing some build failures which seems to be related to this patch

https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/3657/steps/15/logs/stdio

 |   File 
"/home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/gattlib/0.2+git/recipe-sysroot-native/usr/share/glib-2.0/codegen/utils.py",
line 22, in <module>
    |     import packaging.version
    | ModuleNotFoundError: No module named 'packaging'



  |   File 
"/home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/networkmanager-fortisslvpn/1.4.0/recipe-sysroot-native/usr/share/glib-2.0/codegen/utils.py",
line 22, in <module>
    |     import packaging.version
    | ModuleNotFoundError: No module named 'packaging'
    | make: *** [Makefile:2081: src/nm-fortisslvpn-pppd-service-dbus.h] Error 1


On Sun, Feb 25, 2024 at 1:37 AM Martin Jansa <martin.ja...@gmail.com> wrote:
>
> * to fix build on hosts with python-3.12, now it fails with:
>
> Traceback (most recent call last):
>   File "recipe-sysroot-native/usr/bin/gdbus-codegen", line 53, in <module>
>     from codegen import codegen_main
>   File "recipe-sysroot-native/usr/share/glib-2.0/codegen/codegen_main.py", 
> line 29, in <module>
>     from . import dbustypes
>   File "recipe-sysroot-native/usr/share/glib-2.0/codegen/dbustypes.py", line 
> 22, in <module>
>     from . import utils
>   File "recipe-sysroot-native/usr/share/glib-2.0/codegen/utils.py", line 22, 
> in <module>
>     import distutils.version
> ModuleNotFoundError: No module named 'distutils'
> CMake Error at CMakeLists.txt:90 (message):
>   Error in generating code for connman interface using gdbus-codegen
>
> Signed-off-by: Martin Jansa <martin.ja...@gmail.com>
> ---
>  ...deprecated-distutils-module-to-the-p.patch | 34 +++++++++++++++++++
>  meta/recipes-core/glib-2.0/glib-2.0_2.78.3.bb |  1 +
>  meta/recipes-core/glib-2.0/glib.inc           |  4 +--
>  3 files changed, 36 insertions(+), 3 deletions(-)
>  create mode 100644 
> meta/recipes-core/glib-2.0/glib-2.0/0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch
>
> diff --git 
> a/meta/recipes-core/glib-2.0/glib-2.0/0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch
>  
> b/meta/recipes-core/glib-2.0/glib-2.0/0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch
> new file mode 100644
> index 0000000000..50368ed22c
> --- /dev/null
> +++ 
> b/meta/recipes-core/glib-2.0/glib-2.0/0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch
> @@ -0,0 +1,34 @@
> +From 05f0674c93d94fe6b29c1b707980aac469ddcd72 Mon Sep 17 00:00:00 2001
> +From: Jordan Williams <jor...@jwillikers.com>
> +Date: Fri, 1 Dec 2023 09:53:50 -0600
> +Subject: [PATCH] Switch from the deprecated distutils module to the packaging
> + module
> +
> +The distutils module was removed in Python 3.12.
> +
> +Upstream-Status: Backport 
> [https://gitlab.gnome.org/GNOME/glib/-/commit/6ef967a0f930ce37a8c9b5aff969693b34714291]
> +
> +Signed-off-by: Martin Jansa <martin.ja...@gmail.com>
> +---
> + gio/gdbus-2.0/codegen/utils.py | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/gio/gdbus-2.0/codegen/utils.py b/gio/gdbus-2.0/codegen/utils.py
> +index 0204610..08f1ba9 100644
> +--- a/gio/gdbus-2.0/codegen/utils.py
> ++++ b/gio/gdbus-2.0/codegen/utils.py
> +@@ -19,7 +19,7 @@
> + #
> + # Author: David Zeuthen <dav...@redhat.com>
> +
> +-import distutils.version
> ++import packaging.version
> + import os
> + import sys
> +
> +@@ -166,4 +166,4 @@ def version_cmp_key(key):
> +         v = str(key[0])
> +     else:
> +         v = "0"
> +-    return (distutils.version.LooseVersion(v), key[1])
> ++    return (packaging.version.Version(v), key[1])
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.78.3.bb 
> b/meta/recipes-core/glib-2.0/glib-2.0_2.78.3.bb
> index 42814ba544..6c3e99c641 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0_2.78.3.bb
> +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.78.3.bb
> @@ -14,6 +14,7 @@ SRC_URI = 
> "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
>             file://0001-Do-not-write-bindir-into-pkg-config-files.patch \
>             file://0001-meson-Run-atomics-test-on-clang-as-well.patch \
>             
> file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \
> +           
> file://0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch \
>             file://memory-monitor.patch \
>             file://native-gtkdoc.patch \
>             "
> diff --git a/meta/recipes-core/glib-2.0/glib.inc 
> b/meta/recipes-core/glib-2.0/glib.inc
> index 5a57549d85..fac8875d84 100644
> --- a/meta/recipes-core/glib-2.0/glib.inc
> +++ b/meta/recipes-core/glib-2.0/glib.inc
> @@ -144,9 +144,7 @@ do_install:append:mingw32() {
>          rm -f ${D}${bindir}/gtester-report
>  }
>
> -# remove setuptools dependency when usage of distutils is dropped in
> -# 
> https://gitlab.gnome.org/GNOME/glib/-/blob/main/gio/gdbus-2.0/codegen/utils.py
> -CODEGEN_PYTHON_RDEPENDS = "python3 python3-setuptools python3-xml"
> +CODEGEN_PYTHON_RDEPENDS = "python3 python3-packaging python3-xml"
>  CODEGEN_PYTHON_RDEPENDS:mingw32 = ""
>
>  RDEPENDS:${PN}-codegen += "${CODEGEN_PYTHON_RDEPENDS}"
> --
> 2.43.2
>
>
> 
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#196232): 
https://lists.openembedded.org/g/openembedded-core/message/196232
Mute This Topic: https://lists.openembedded.org/mt/104560766/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to