mirror of
https://git.yoctoproject.org/poky
synced 2026-09-14 21:49:33 +02:00
libcap-ng: upgrade 0.8.4 -> 0.8.5
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. (From OE-Core rev: 0263fd8193e51e54a4598ea3811c3c0a6e781f85) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -0,0 +1,34 @@
|
|||||||
|
From 1fe7c1cfeea00ba4eb903fbb39b74361594d4835 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jan Palus <jpalus@fastmail.com>
|
||||||
|
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 <yi.zhao@windriver.com>
|
||||||
|
---
|
||||||
|
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
|
||||||
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
From 355eada2d20886287cffc16e304087dd6f66ae37 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Steve Grubb <ausearch.1@gmail.com>
|
|
||||||
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 <anuj.mittal@intel.com>
|
|
||||||
---
|
|
||||||
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
|
|
||||||
|
|
||||||
@@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
|
|||||||
file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
|
file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
|
||||||
|
|
||||||
SRC_URI = "https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \
|
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-target = " --with-capability_header=${STAGING_INCDIR}/linux/capability.h"
|
||||||
EXTRA_OECONF:append:class-nativesdk = " --with-capability_header=${STAGING_INCDIR}/linux/capability.h"
|
EXTRA_OECONF:append:class-nativesdk = " --with-capability_header=${STAGING_INCDIR}/linux/capability.h"
|
||||||
|
|||||||
Reference in New Issue
Block a user