diff options
Diffstat (limited to 'poky/meta/recipes-support/libcap-ng')
4 files changed, 64 insertions, 63 deletions
diff --git a/poky/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.2.bb b/poky/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.2.bb index 43f76dc56..6cea422d1 100644 --- a/poky/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.2.bb +++ b/poky/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.2.bb @@ -4,14 +4,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/libcap-ng:" SUMMARY .= " - python" -inherit lib_package autotools python3native +inherit lib_package autotools python3targetconfig DEPENDS += "libcap-ng python3 swig-native" S = "${WORKDIR}/libcap-ng-${PV}" EXTRA_OECONF += "--with-python --with-python3" -EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}${PYTHON_ABI}' PYINC='${STAGING_INCDIR}/${PYLIBVER}'" do_install_append() { rm -rf ${D}${bindir} diff --git a/poky/meta/recipes-support/libcap-ng/libcap-ng.inc b/poky/meta/recipes-support/libcap-ng/libcap-ng.inc index 8c52b5d0b..64bc62de2 100644 --- a/poky/meta/recipes-support/libcap-ng/libcap-ng.inc +++ b/poky/meta/recipes-support/libcap-ng/libcap-ng.inc @@ -8,9 +8,12 @@ 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://python.patch \ + file://determinism.patch \ " SRC_URI[sha256sum] = "52c083b77c2b0d8449dee141f9c3eba76e6d4c5ad44ef05df25891126cb85ae9" +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" + BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/libcap-ng/libcap-ng/determinism.patch b/poky/meta/recipes-support/libcap-ng/libcap-ng/determinism.patch new file mode 100644 index 000000000..fbb7380f5 --- /dev/null +++ b/poky/meta/recipes-support/libcap-ng/libcap-ng/determinism.patch @@ -0,0 +1,59 @@ +[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 + diff --git a/poky/meta/recipes-support/libcap-ng/libcap-ng/python.patch b/poky/meta/recipes-support/libcap-ng/libcap-ng/python.patch deleted file mode 100644 index fcd6f9cd3..000000000 --- a/poky/meta/recipes-support/libcap-ng/libcap-ng/python.patch +++ /dev/null @@ -1,60 +0,0 @@ -Subject: [PATCH] configure.ac - Avoid an incorrect check for python. - Makefile.am - avoid hard coded host include paths. - -Upstream-Status: pending - -Signed-off-by: Mark Hatle <mark.hatle@windriver.com> -Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> -Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> - ---- - bindings/python/Makefile.am | 4 +++- - configure.ac | 17 ++--------------- - 2 files changed, 5 insertions(+), 16 deletions(-) - -diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am -index 999b184..c8e49db 100644 ---- a/bindings/python/Makefile.am -+++ b/bindings/python/Makefile.am -@@ -23,7 +23,9 @@ - SUBDIRS = test - CONFIG_CLEAN_FILES = *.loT *.rej *.orig - AM_CFLAGS = -fPIC -DPIC --AM_CPPFLAGS = -I. -I$(top_builddir) -I@PYINCLUDEDIR@ -+PYLIBVER ?= python$(PYTHON_VERSION) -+PYINC ?= /usr/include/$(PYLIBVER) -+AM_CPPFLAGS = -I. -I$(top_builddir) -I$(PYINC) - SWIG_FLAGS = -python - SWIG_INCLUDES = ${AM_CPPFLAGS} - pyexec_PYTHON = capng.py -diff --git a/configure.ac b/configure.ac -index 8b46f51..2d7e00c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -141,21 +141,8 @@ fi - - # Setup Python2 with the interpreter found previously. - AM_PATH_PYTHON --PYINCLUDEDIR=`python${am_cv_python_version} -c "from distutils import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))"` --if test -f ${PYINCLUDEDIR}/Python.h ; then -- python_found="yes" -- AC_SUBST(PYINCLUDEDIR) -- pybind_dir="python" -- AC_SUBST(pybind_dir) -- AC_MSG_NOTICE(Python bindings will be built) --else -- python_found="no" -- if test "x$use_python" = xyes ; then -- AC_MSG_ERROR([Python explicitly requested and python headers were not found]) -- else -- AC_MSG_WARN("Python headers not found - python bindings will not be made") -- fi --fi -+python_found="yes" -+AC_MSG_NOTICE(Python bindings will be built) - fi - AM_CONDITIONAL(HAVE_PYTHON, test ${python_found} = "yes") - --- -2.25.1 |