From patchwork Thu Nov 23 11:34:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 35131 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 000B7C61D85 for ; Thu, 23 Nov 2023 11:35:06 +0000 (UTC) Received: from mailout06.t-online.de (mailout06.t-online.de [194.25.134.19]) by mx.groups.io with SMTP id smtpd.web11.89093.1700739297607395918 for ; Thu, 23 Nov 2023 03:34:57 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: t-online.de, ip: 194.25.134.19, mailfrom: f_l_k@t-online.de) Received: from fwd81.aul.t-online.de (fwd81.aul.t-online.de [10.223.144.107]) by mailout06.t-online.de (Postfix) with SMTP id 9C69623390 for ; Thu, 23 Nov 2023 12:34:55 +0100 (CET) Received: from intel-corei7-64.fritz.box ([84.163.41.134]) by fwd81.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1r67yw-0WwZHd0; Thu, 23 Nov 2023 12:34:54 +0100 From: Markus Volk To: openembedded-core@lists.openembedded.org Subject: [oe-core][PATCH] pciutils: add packageconfigs for options Date: Thu, 23 Nov 2023 12:34:52 +0100 Message-ID: <20231123113452.1697802-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1700739294-FEB02990-9245B888/0/0 CLEAN NORMAL X-TOI-MSGID: 73e690f3-e619-4d48-a5e5-92a2ba182a08 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 ; Thu, 23 Nov 2023 11:35:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191142 My motivation for this is to get zlib support selectable, because libosinfo requires the pci.ids file uncompressed. Add packageconfigs for the other options as well to avoid autoselect. Configuration stays the same besides zlib is deselected by default. Signed-off-by: Markus Volk --- meta/recipes-bsp/pciutils/pciutils_3.10.0.bb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/meta/recipes-bsp/pciutils/pciutils_3.10.0.bb b/meta/recipes-bsp/pciutils/pciutils_3.10.0.bb index e27cfd4ced..4bde090169 100644 --- a/meta/recipes-bsp/pciutils/pciutils_3.10.0.bb +++ b/meta/recipes-bsp/pciutils/pciutils_3.10.0.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" # Can drop make-native when all systems have make 4.3 # https://git.savannah.gnu.org/cgit/make.git/commit/?id=b90fabc8d6f34fb37d428dc0fb1b8b1951a9fbed # causes space issues in lib/libpci.pc -DEPENDS = "zlib kmod make-native" +DEPENDS = "make-native" SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \ file://configure.patch" @@ -18,10 +18,11 @@ SRC_URI[sha256sum] = "238a2e27166730e53a17fe07bfad229e07fa39b618117e5944b6d7eda9 inherit multilib_header pkgconfig update-alternatives -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'hwdb', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'hwdb', '', d)} dns kmod" PACKAGECONFIG[hwdb] = "HWDB=yes,HWDB=no,udev" - -PCI_CONF_FLAG = "ZLIB=yes DNS=yes SHARED=yes STRIP= LIBDIR=${libdir}" +PACKAGECONFIG[zlib] = "ZLIB=yes,ZLIB=no,zlib" +PACKAGECONFIG[kmod] = "LIBKMOD=yes,LIBKMOD=no,kmod" +PACKAGECONFIG[dns] = "DNS=yes,DNS=no" # see configure.patch do_configure () { @@ -38,7 +39,7 @@ export SBINDIR = "${sbindir}" export SHAREDIR = "${datadir}" export MANDIR = "${mandir}" -EXTRA_OEMAKE = "-e MAKEFLAGS= ${PCI_CONF_FLAG}" +EXTRA_OEMAKE = "-e MAKEFLAGS= SHARED=yes STRIP= LIBDIR=${libdir}" ASNEEDED = ""