1. Changelog https://github.com/stevegrubb/libcap-ng/releases/tag/v0.9
2. Drop file://0001-Fix-python-path-when-invoking-py-compile-54.patch as it was merged upstream. 3. Add pkgconfig to solve following configure error: ../sources/libcap-ng-0.9/configure: line 14862: syntax error near unexpected token `LIBBPF,libbpf,' ../sources/libcap-ng-0.9/configure: line 14862: `PKG_CHECK_MODULES(LIBBPF,libbpf,' Signed-off-by: Liu Yiding <[email protected]> --- ...hon-path-when-invoking-py-compile-54.patch | 34 ------------------- ...ython_0.8.5.bb => libcap-ng-python_0.9.bb} | 0 meta/recipes-support/libcap-ng/libcap-ng.inc | 8 ++--- .../{libcap-ng_0.8.5.bb => libcap-ng_0.9.bb} | 0 4 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 meta/recipes-support/libcap-ng/files/0001-Fix-python-path-when-invoking-py-compile-54.patch rename meta/recipes-support/libcap-ng/{libcap-ng-python_0.8.5.bb => libcap-ng-python_0.9.bb} (100%) rename meta/recipes-support/libcap-ng/{libcap-ng_0.8.5.bb => libcap-ng_0.9.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 deleted file mode 100644 index a0452ad53d..0000000000 --- a/meta/recipes-support/libcap-ng/files/0001-Fix-python-path-when-invoking-py-compile-54.patch +++ /dev/null @@ -1,34 +0,0 @@ -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/libcap-ng-python_0.8.5.bb b/meta/recipes-support/libcap-ng/libcap-ng-python_0.9.bb similarity index 100% rename from meta/recipes-support/libcap-ng/libcap-ng-python_0.8.5.bb rename to meta/recipes-support/libcap-ng/libcap-ng-python_0.9.bb diff --git a/meta/recipes-support/libcap-ng/libcap-ng.inc b/meta/recipes-support/libcap-ng/libcap-ng.inc index ed8712bf2b..632527eb12 100644 --- a/meta/recipes-support/libcap-ng/libcap-ng.inc +++ b/meta/recipes-support/libcap-ng/libcap-ng.inc @@ -7,12 +7,10 @@ LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" -SRC_URI = "git://github.com/stevegrubb/libcap-ng.git;protocol=https;branch=master \ - file://0001-Fix-python-path-when-invoking-py-compile-54.patch \ - " -SRCREV = "f5d39702622208b3ada064d7b2eaeaf1454c9bd3" +SRC_URI = "git://github.com/stevegrubb/libcap-ng.git;protocol=https;branch=master;tag=v${PV}" +SRCREV = "6ab1fe90fc24fcc1ed4ced635eb20166bcf00023" -inherit lib_package autotools +inherit lib_package autotools pkgconfig do_configure:prepend() { touch ${S}/NEWS diff --git a/meta/recipes-support/libcap-ng/libcap-ng_0.8.5.bb b/meta/recipes-support/libcap-ng/libcap-ng_0.9.bb similarity index 100% rename from meta/recipes-support/libcap-ng/libcap-ng_0.8.5.bb rename to meta/recipes-support/libcap-ng/libcap-ng_0.9.bb -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#229237): https://lists.openembedded.org/g/openembedded-core/message/229237 Mute This Topic: https://lists.openembedded.org/mt/117240778/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
