From: Yi Zhao <[email protected]> Changelog: https://people.redhat.com/sgrubb/libcap-ng/ChangeLog
- Remove python global exception handler since it's deprecated - Make the utilities link against just built libraries - Remove unused macro in cap-ng.h Drop backport patch fix-issues-with-swig-4-2.patch. Backport a patch to fix build for libcap-ng-python. Signed-off-by: Yi Zhao <[email protected]> Signed-off-by: Richard Purdie <[email protected]> (cherry picked from commit 0263fd8193e51e54a4598ea3811c3c0a6e781f85) Signed-off-by: Steve Sakoman <[email protected]> --- ...hon-path-when-invoking-py-compile-54.patch | 34 +++++++++++++++++++ .../files/fix-issues-with-swig-4-2.patch | 32 ----------------- meta/recipes-support/libcap-ng/libcap-ng.inc | 4 +-- ...{libcap-ng_0.8.4.bb => libcap-ng_0.8.5.bb} | 0 4 files changed, 36 insertions(+), 34 deletions(-) create mode 100644 meta/recipes-support/libcap-ng/files/0001-Fix-python-path-when-invoking-py-compile-54.patch delete mode 100644 meta/recipes-support/libcap-ng/files/fix-issues-with-swig-4-2.patch rename meta/recipes-support/libcap-ng/{libcap-ng_0.8.4.bb => libcap-ng_0.8.5.bb} (100%) diff --git a/meta/recipes-support/libcap-ng/files/0001-Fix-python-path-when-invoking-py-compile-54.patch b/meta/recipes-support/libcap-ng/files/0001-Fix-python-path-when-invoking-py-compile-54.patch new file mode 100644 index 0000000000..a0452ad53d --- /dev/null +++ b/meta/recipes-support/libcap-ng/files/0001-Fix-python-path-when-invoking-py-compile-54.patch @@ -0,0 +1,34 @@ +From 1fe7c1cfeea00ba4eb903fbb39b74361594d4835 Mon Sep 17 00:00:00 2001 +From: Jan Palus <[email protected]> +Date: Wed, 10 Apr 2024 21:30:51 +0200 +Subject: [PATCH] Fix python path when invoking py-compile (#54) + +48eebb2 replaced custom PYTHON3 variable with PYTHON by using standard +AM_PATH_PYTHON macro. Makefile however still referred to old one. +There's no need to set PYTHON explicitly anymore so drop it. + +Fixes #53 + +Upstream-Status: Backport +[https://github.com/stevegrubb/libcap-ng/commit/1fe7c1cfeea00ba4eb903fbb39b74361594d4835] + +Signed-off-by: Yi Zhao <[email protected]> +--- + bindings/python3/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/bindings/python3/Makefile.am b/bindings/python3/Makefile.am +index 70a1dd8..6072fc2 100644 +--- a/bindings/python3/Makefile.am ++++ b/bindings/python3/Makefile.am +@@ -27,7 +27,6 @@ AM_CPPFLAGS = -I. -I$(top_builddir) $(PYTHON3_INCLUDES) + LIBS = ${top_builddir}/src/libcap-ng.la + SWIG_FLAGS = -python + SWIG_INCLUDES = ${AM_CPPFLAGS} +-PYTHON = $(PYTHON3) + pyexec_PYTHON = capng.py + pyexec_LTLIBRARIES = _capng.la + pyexec_SOLIBRARIES = _capng.so +-- +2.25.1 + diff --git a/meta/recipes-support/libcap-ng/files/fix-issues-with-swig-4-2.patch b/meta/recipes-support/libcap-ng/files/fix-issues-with-swig-4-2.patch deleted file mode 100644 index fb424fe725..0000000000 --- a/meta/recipes-support/libcap-ng/files/fix-issues-with-swig-4-2.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 355eada2d20886287cffc16e304087dd6f66ae37 Mon Sep 17 00:00:00 2001 -From: Steve Grubb <[email protected]> -Date: Thu, 4 Jan 2024 15:06:29 -0500 -Subject: [PATCH] Remove python global exception handler since its deprecated - -Upstream-Status: Backport [https://github.com/stevegrubb/libcap-ng/commit/30453b6553948cd05c438f9f509013e3bb84f25b] -Signed-off-by: Anuj Mittal <[email protected]> ---- - bindings/src/capng_swig.i | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/bindings/src/capng_swig.i b/bindings/src/capng_swig.i -index fcdaf18..fa85e13 100644 ---- a/bindings/src/capng_swig.i -+++ b/bindings/src/capng_swig.i -@@ -30,13 +30,6 @@ - - %varargs(16, signed capability = 0) capng_updatev; - --%except(python) { -- $action -- if (result < 0) { -- PyErr_SetFromErrno(PyExc_OSError); -- return NULL; -- } --} - #endif - - %define __signed__ --- -2.43.2 - diff --git a/meta/recipes-support/libcap-ng/libcap-ng.inc b/meta/recipes-support/libcap-ng/libcap-ng.inc index 845b7c2f0a..12b4002d11 100644 --- a/meta/recipes-support/libcap-ng/libcap-ng.inc +++ b/meta/recipes-support/libcap-ng/libcap-ng.inc @@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" SRC_URI = "https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \ - file://fix-issues-with-swig-4-2.patch \ + file://0001-Fix-python-path-when-invoking-py-compile-54.patch \ " -SRC_URI[sha256sum] = "68581d3b38e7553cb6f6ddf7813b1fc99e52856f21421f7b477ce5abd2605a8a" +SRC_URI[sha256sum] = "3ba5294d1cbdfa98afaacfbc00b6af9ed2b83e8a21817185dfd844cc8c7ac6ff" EXTRA_OECONF:append:class-target = " --with-capability_header=${STAGING_INCDIR}/linux/capability.h" EXTRA_OECONF:append:class-nativesdk = " --with-capability_header=${STAGING_INCDIR}/linux/capability.h" diff --git a/meta/recipes-support/libcap-ng/libcap-ng_0.8.4.bb b/meta/recipes-support/libcap-ng/libcap-ng_0.8.5.bb similarity index 100% rename from meta/recipes-support/libcap-ng/libcap-ng_0.8.4.bb rename to meta/recipes-support/libcap-ng/libcap-ng_0.8.5.bb -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#201862): https://lists.openembedded.org/g/openembedded-core/message/201862 Mute This Topic: https://lists.openembedded.org/mt/107213086/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
