From 0284c59c41053de2ebca1c1de9ea6f1a2767115f Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 27 Apr 2022 10:40:06 +0200 Subject: libcap-ng: update 0.8.2 -> 0.8.3 Remove upstreamed patch. (From OE-Core rev: c96a3f3269ecadbb88011acca61902bbdc76522b) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../libcap-ng/libcap-ng-python_0.8.2.bb | 28 ---------- .../libcap-ng/libcap-ng-python_0.8.3.bb | 28 ++++++++++ meta/recipes-support/libcap-ng/libcap-ng.inc | 6 +-- .../libcap-ng/libcap-ng/determinism.patch | 59 ---------------------- meta/recipes-support/libcap-ng/libcap-ng_0.8.2.bb | 17 ------- meta/recipes-support/libcap-ng/libcap-ng_0.8.3.bb | 17 +++++++ 6 files changed, 47 insertions(+), 108 deletions(-) delete mode 100644 meta/recipes-support/libcap-ng/libcap-ng-python_0.8.2.bb create mode 100644 meta/recipes-support/libcap-ng/libcap-ng-python_0.8.3.bb delete mode 100644 meta/recipes-support/libcap-ng/libcap-ng/determinism.patch delete mode 100644 meta/recipes-support/libcap-ng/libcap-ng_0.8.2.bb create mode 100644 meta/recipes-support/libcap-ng/libcap-ng_0.8.3.bb (limited to 'meta/recipes-support/libcap-ng') 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.2.bb deleted file mode 100644 index 1240589d00..0000000000 --- a/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.2.bb +++ /dev/null @@ -1,28 +0,0 @@ -require libcap-ng.inc - -FILESEXTRAPATHS:prepend := "${THISDIR}/libcap-ng:" - -SUMMARY .= " - python" - -inherit lib_package autotools python3targetconfig - -DEPENDS += "libcap-ng python3 swig-native" - -S = "${WORKDIR}/libcap-ng-${PV}" - -EXTRA_OECONF += "--with-python --with-python3" - -do_install:append() { - rm -rf ${D}${bindir} - rm -rf ${D}${libdir}/.debug - rm -f ${D}${libdir}/lib* - rm -rf ${D}${libdir}/pkgconfig - rm -rf ${D}${datadir} - rm -rf ${D}${includedir} -} - -# PACKAGES = "${PN}" - -FILES:${PN} = "${libdir}/python${PYTHON_BASEVERSION}" -FILES:${PN}-dbg =+ "${PYTHON_SITEPACKAGES_DIR}/.debug/_capng.so" - diff --git a/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.3.bb b/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.3.bb new file mode 100644 index 0000000000..1240589d00 --- /dev/null +++ b/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.3.bb @@ -0,0 +1,28 @@ +require libcap-ng.inc + +FILESEXTRAPATHS:prepend := "${THISDIR}/libcap-ng:" + +SUMMARY .= " - python" + +inherit lib_package autotools python3targetconfig + +DEPENDS += "libcap-ng python3 swig-native" + +S = "${WORKDIR}/libcap-ng-${PV}" + +EXTRA_OECONF += "--with-python --with-python3" + +do_install:append() { + rm -rf ${D}${bindir} + rm -rf ${D}${libdir}/.debug + rm -f ${D}${libdir}/lib* + rm -rf ${D}${libdir}/pkgconfig + rm -rf ${D}${datadir} + rm -rf ${D}${includedir} +} + +# PACKAGES = "${PN}" + +FILES:${PN} = "${libdir}/python${PYTHON_BASEVERSION}" +FILES:${PN}-dbg =+ "${PYTHON_SITEPACKAGES_DIR}/.debug/_capng.so" + 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 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/meta/recipes-support/libcap-ng/libcap-ng_0.8.2.bb b/meta/recipes-support/libcap-ng/libcap-ng_0.8.2.bb deleted file mode 100644 index 6e16e886b9..0000000000 --- a/meta/recipes-support/libcap-ng/libcap-ng_0.8.2.bb +++ /dev/null @@ -1,17 +0,0 @@ -require libcap-ng.inc - -inherit lib_package autotools - -EXTRA_OECONF += "--without-python --without-python3" - -BBCLASSEXTEND = "native nativesdk" - -do_install:append() { - # Moving libcap-ng to base_libdir - if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then - mkdir -p ${D}/${base_libdir}/ - mv -f ${D}${libdir}/libcap-ng.so.* ${D}${base_libdir}/ - relpath=${@os.path.relpath("${base_libdir}", "${libdir}")} - ln -sf ${relpath}/libcap-ng.so.0.0.0 ${D}${libdir}/libcap-ng.so - fi -} diff --git a/meta/recipes-support/libcap-ng/libcap-ng_0.8.3.bb b/meta/recipes-support/libcap-ng/libcap-ng_0.8.3.bb new file mode 100644 index 0000000000..6e16e886b9 --- /dev/null +++ b/meta/recipes-support/libcap-ng/libcap-ng_0.8.3.bb @@ -0,0 +1,17 @@ +require libcap-ng.inc + +inherit lib_package autotools + +EXTRA_OECONF += "--without-python --without-python3" + +BBCLASSEXTEND = "native nativesdk" + +do_install:append() { + # Moving libcap-ng to base_libdir + if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then + mkdir -p ${D}/${base_libdir}/ + mv -f ${D}${libdir}/libcap-ng.so.* ${D}${base_libdir}/ + relpath=${@os.path.relpath("${base_libdir}", "${libdir}")} + ln -sf ${relpath}/libcap-ng.so.0.0.0 ${D}${libdir}/libcap-ng.so + fi +} -- cgit v1.2.3-54-g00ecf