Remove upstreamed patch.
Signed-off-by: Alexander Kanavin <[email protected]>
---
...hon_0.8.2.bb => libcap-ng-python_0.8.3.bb} | 0
meta/recipes-support/libcap-ng/libcap-ng.inc | 6 +-
.../libcap-ng/libcap-ng/determinism.patch | 59 -------------------
...{libcap-ng_0.8.2.bb => libcap-ng_0.8.3.bb} | 0
4 files changed, 2 insertions(+), 63 deletions(-)
rename meta/recipes-support/libcap-ng/{libcap-ng-python_0.8.2.bb =>
libcap-ng-python_0.8.3.bb} (100%)
delete mode 100644 meta/recipes-support/libcap-ng/libcap-ng/determinism.patch
rename meta/recipes-support/libcap-ng/{libcap-ng_0.8.2.bb =>
libcap-ng_0.8.3.bb} (100%)
diff --git a/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.2.bb
b/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.3.bb
similarity index 100%
rename from meta/recipes-support/libcap-ng/libcap-ng-python_0.8.2.bb
rename to meta/recipes-support/libcap-ng/libcap-ng-python_0.8.3.bb
diff --git a/meta/recipes-support/libcap-ng/libcap-ng.inc
b/meta/recipes-support/libcap-ng/libcap-ng.inc
index 57fcd50d9f..55e3287396 100644
--- a/meta/recipes-support/libcap-ng/libcap-ng.inc
+++ b/meta/recipes-support/libcap-ng/libcap-ng.inc
@@ -7,11 +7,9 @@ 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 = "https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \
- file://determinism.patch \
-"
+SRC_URI = "https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz";
-SRC_URI[sha256sum] =
"52c083b77c2b0d8449dee141f9c3eba76e6d4c5ad44ef05df25891126cb85ae9"
+SRC_URI[sha256sum] =
"bed6f6848e22bb2f83b5f764b2aef0ed393054e803a8e3a8711cb2a39e6b492d"
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/determinism.patch
b/meta/recipes-support/libcap-ng/libcap-ng/determinism.patch
deleted file mode 100644
index fbb7380f56..0000000000
--- a/meta/recipes-support/libcap-ng/libcap-ng/determinism.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-[PATCH] bindings/python: Allow hardcoded path to capability.h to be overridden
-
-Currently the path to capability.h is hardcoded. When cross compiling
-the host capabiity.h may be different to the target copy, leading
-to different options being encoded in the python bindings than
-expected. This causes a reproducibility issue amongst other potential
-problems.
-
-Add a configure option to optionally specify the right path to the
-correct header as its probably safer/more reliable than trying to
-query the compiler to get the header path.
-
-Signed-off-by: Richard Purdie [email protected]
-Upstream-Status: Submitted [https://github.com/stevegrubb/libcap-ng/pull/30]
-
-Index: libcap-ng-0.8.2/configure.ac
-===================================================================
---- libcap-ng-0.8.2.orig/configure.ac
-+++ libcap-ng-0.8.2/configure.ac
-@@ -63,6 +63,13 @@ AC_CHECK_HEADERS(sys/vfs.h, [
- AC_CHECK_HEADERS(linux/magic.h, [] [AC_MSG_WARN(linux/magic.h is
required in order to verify procfs.)])
- ], [AC_MSG_WARN(sys/vfs.h is required in order to verify procfs.)])
-
-+
-+AC_ARG_WITH([capability_header],
-+ [AS_HELP_STRING([--with-capability_header=path : path to
cpapbility.h])],
-+ [CAPABILITY_HEADER=$withval],
-+ [CAPABILITY_HEADER=/usr/include/linux/capability.h])
-+AC_SUBST(CAPABILITY_HEADER)
-+
- AC_C_CONST
- AC_C_INLINE
- AM_PROG_CC_C_O
-Index: libcap-ng-0.8.2/bindings/python3/Makefile.am
-===================================================================
---- libcap-ng-0.8.2.orig/bindings/python3/Makefile.am
-+++ libcap-ng-0.8.2/bindings/python3/Makefile.am
-@@ -41,7 +41,7 @@ nodist__capng_la_SOURCES = capng_wrap.c
- capng.py capng_wrap.c: ${srcdir}/../src/capng_swig.i caps.h capng.h
- swig -o capng_wrap.c ${SWIG_FLAGS} ${SWIG_INCLUDES}
${srcdir}/../src/capng_swig.i
- caps.h:
-- cat /usr/include/linux/capability.h | grep '^#define CAP' | grep -v
'[()]' > caps.h
-+ cat $(CAPABILITY_HEADER) | grep '^#define CAP' | grep -v '[()]' >
caps.h
- capng.h:
- cat ${top_srcdir}/src/cap-ng.h | grep -v '_state' > capng.h
-
-Index: libcap-ng-0.8.2/bindings/python/Makefile.am
-===================================================================
---- libcap-ng-0.8.2.orig/bindings/python/Makefile.am
-+++ libcap-ng-0.8.2/bindings/python/Makefile.am
-@@ -38,7 +38,7 @@ nodist__capng_la_SOURCES = capng_wrap.c
- capng.py capng_wrap.c: ${srcdir}/../src/capng_swig.i caps.h capng.h
- swig -o capng_wrap.c ${SWIG_FLAGS} ${SWIG_INCLUDES}
${srcdir}/../src/capng_swig.i
- caps.h:
-- cat /usr/include/linux/capability.h | grep '^#define CAP' | grep -v
'[()]' > caps.h
-+ cat $(CAPABILITY_HEADER) | grep '^#define CAP' | grep -v '[()]' >
caps.h
- capng.h:
- cat ${top_srcdir}/src/cap-ng.h | grep -v '_state' > capng.h
-
diff --git a/meta/recipes-support/libcap-ng/libcap-ng_0.8.2.bb
b/meta/recipes-support/libcap-ng/libcap-ng_0.8.3.bb
similarity index 100%
rename from meta/recipes-support/libcap-ng/libcap-ng_0.8.2.bb
rename to meta/recipes-support/libcap-ng/libcap-ng_0.8.3.bb
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#164906):
https://lists.openembedded.org/g/openembedded-core/message/164906
Mute This Topic: https://lists.openembedded.org/mt/90726572/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
