From patchwork Tue Jul 23 16:03:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 46776 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45C54C3DA49 for ; Tue, 23 Jul 2024 16:03:56 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.834.1721750631213559320 for ; Tue, 23 Jul 2024 09:03:51 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0BC081007 for ; Tue, 23 Jul 2024 09:04:16 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 42F083F73F for ; Tue, 23 Jul 2024 09:03:50 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH] libcap-ng: clean up recipe Date: Tue, 23 Jul 2024 17:03:46 +0100 Message-Id: <20240723160346.2247691-1-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 23 Jul 2024 16:03:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/202410 This package is split into two recipes, one of the actual C library and one for the Python bindings. - Move common inherits into the common .inc. - Clean up install in the python recipe - Remove obsolete setuptools dependency - Remove obsolete explicit .debug packaging - Update homepage as freecode.com redirects to the top of SourceForge Signed-off-by: Ross Burton --- .../libcap-ng/libcap-ng-python_0.8.5.bb | 18 ++++-------------- meta/recipes-support/libcap-ng/libcap-ng.inc | 4 +++- .../libcap-ng/libcap-ng_0.8.5.bb | 2 -- 3 files changed, 7 insertions(+), 17 deletions(-) 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.8.5.bb index 4790134ae9f..f8a6b2c3177 100644 --- a/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.5.bb +++ b/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.5.bb @@ -4,26 +4,16 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/libcap-ng:" SUMMARY .= " - python" -inherit lib_package autotools python3targetconfig +inherit python3targetconfig -# drop setuptools when version > 0.8.3 is released; it's needed only for distutils -DEPENDS += "libcap-ng python3 swig-native python3-setuptools-native" +DEPENDS += "libcap-ng python3 swig-native" S = "${WORKDIR}/libcap-ng-${PV}" EXTRA_OECONF += "--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} +do_install() { + oe_runmake 'DESTDIR=${D}' install -C ${B}/bindings/python3 } -# 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 12b4002d117..85b51c4dc67 100644 --- a/meta/recipes-support/libcap-ng/libcap-ng.inc +++ b/meta/recipes-support/libcap-ng/libcap-ng.inc @@ -1,7 +1,7 @@ SUMMARY = "An alternate posix capabilities library" DESCRIPTION = "The libcap-ng library is intended to make programming \ with POSIX capabilities much easier than the traditional libcap library." -HOMEPAGE = "http://freecode.com/projects/libcap-ng" +HOMEPAGE = "https://github.com/stevegrubb/libcap-ng" SECTION = "base" LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ @@ -13,6 +13,8 @@ SRC_URI = "https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \ SRC_URI[sha256sum] = "3ba5294d1cbdfa98afaacfbc00b6af9ed2b83e8a21817185dfd844cc8c7ac6ff" +inherit lib_package autotools + 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_0.8.5.bb b/meta/recipes-support/libcap-ng/libcap-ng_0.8.5.bb index 3dbe3e2ffd9..b482368a41b 100644 --- a/meta/recipes-support/libcap-ng/libcap-ng_0.8.5.bb +++ b/meta/recipes-support/libcap-ng/libcap-ng_0.8.5.bb @@ -1,7 +1,5 @@ require libcap-ng.inc -inherit lib_package autotools - EXTRA_OECONF += "--without-python3" BBCLASSEXTEND = "native nativesdk"