mirror of
https://git.yoctoproject.org/poky
synced 2026-02-20 08:29:42 +01:00
libcap-ng: update 0.8.2 -> 0.8.3
Remove upstreamed patch. (From OE-Core rev: c96a3f3269ecadbb88011acca61902bbdc76522b) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
d88d5c978d
commit
0284c59c41
@@ -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"
|
||||
|
||||
@@ -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 richard.purdie@linuxfoundation.org
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user