From fd4f09378aa37af07c69c14d0493d8474a5f46b0 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Thu, 20 Mar 2025 16:57:39 +0800 Subject: [PATCH] cmpi-bindings: upgrade 1.0.4 -> 1.0.5 0001-cmpi-bindings-Fix-build-error-with-gcc14.patch removed since it's included in 1.0.5 Changelog: =============== - Fix build error with gcc14 - Update Python initialization for Python 3.11 - Reduce compiler warnings Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...-bindings-Fix-build-error-with-gcc14.patch | 46 ------------------- ...ndings_1.0.4.bb => cmpi-bindings_1.0.5.bb} | 5 +- 2 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-cmpi-bindings-Fix-build-error-with-gcc14.patch rename meta-oe/recipes-extended/cmpi-bindings/{cmpi-bindings_1.0.4.bb => cmpi-bindings_1.0.5.bb} (91%) diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-cmpi-bindings-Fix-build-error-with-gcc14.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-cmpi-bindings-Fix-build-error-with-gcc14.patch deleted file mode 100644 index 750d10a5f1..0000000000 --- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-cmpi-bindings-Fix-build-error-with-gcc14.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 9e4063a9a3fb2fab69d906902a8432da2544654b Mon Sep 17 00:00:00 2001 -From: Lei Maohui -Date: Tue, 11 Jun 2024 01:38:55 +0000 -Subject: [PATCH] cmpi-bindings: Fix build error with gcc14. - -The build error is as the following: - -| build-daily-2/tmp/work/aarch64-ubinux-linux/cmpi-bindings/1.0.4/git/swig/python/../../src/target_python.c:168:21: error: passing argument 1 of 'Py_SetProgramName' from incompatible pointer type [-Wincompatible-pointer-types] -| 168 | Py_SetProgramName("cmpi_swig"); -| | ^~~~~~~~~~~ -| | | -| | char * -| build-daily-2/tmp/work/aarch64-ubinux-linux/cmpi-bindings/1.0.4/recipe-sysroot/usr/include/python3.12/pylifecycle.h:37:56: note: expected 'const wchar_t *' {aka 'const unsigned int *'} but argument is of type 'char *' -| 37 | Py_DEPRECATED(3.11) PyAPI_FUNC(void) Py_SetProgramName(const wchar_t *); -| | - -Upstream-Status: Submitted -Signed-off-by: Lei Maohui ---- - src/target_python.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/target_python.c b/src/target_python.c -index a8dfd30..69a2515 100644 ---- a/src/target_python.c -+++ b/src/target_python.c -@@ -154,6 +154,7 @@ cleanup: - static int - PyGlobalInitialize(const CMPIBroker* broker, CMPIStatus* st) - { -+ const wchar_t proname[] = L"cmpi_swig"; - /* _SBLIM_TRACE(1,("<%d/0x%x> PyGlobalInitialize() called", getpid(), pthread_self())); */ - - if (_TARGET_INIT) -@@ -165,7 +166,7 @@ PyGlobalInitialize(const CMPIBroker* broker, CMPIStatus* st) - - _SBLIM_TRACE(1,("<%d/0x%x> Python: Loading", getpid(), pthread_self())); - -- Py_SetProgramName("cmpi_swig"); -+ Py_SetProgramName(proname); - Py_Initialize(); - #if PY_MAJOR_VERSION < 3 - SWIGEXPORT void SWIG_init(void); --- -2.34.1 - diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.5.bb similarity index 91% rename from meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb rename to meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.5.bb index 541a360765..e1f6c558df 100644 --- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb +++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.5.bb @@ -6,14 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b19ee058d2d5f69af45da98051d91064" SECTION = "Development/Libraries" DEPENDS = "swig-native sblim-cmpi-devel python3-setuptools-native" -SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=https;branch=master \ +SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=https;branch=main \ file://cmpi-bindings-0.4.17-no-ruby-perl.patch \ file://cmpi-bindings-0.4.17-sblim-sigsegv.patch \ file://0001-Fix-error.patch \ - file://0001-cmpi-bindings-Fix-build-error-with-gcc14.patch \ " -SRCREV = "69077ee4d249816ed428155fc933dca424167e77" +SRCREV = "49d6dcfc71ca421100fcf325e31625817c469fc9" S = "${WORKDIR}/git" inherit cmake python3targetconfig