From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 21 Jan 2022 08:24:17 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nAoHR-008XhH-0p for lore@lore.pengutronix.de; Fri, 21 Jan 2022 08:24:17 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nAoHQ-0002T9-6x; Fri, 21 Jan 2022 08:24:16 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nAoCw-0005s7-Ks; Fri, 21 Jan 2022 08:19:38 +0100 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1nAoCw-00BW7d-Jq; Fri, 21 Jan 2022 08:19:37 +0100 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nAoCv-008G9C-2Q; Fri, 21 Jan 2022 08:19:37 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 21 Jan 2022 08:19:37 +0100 Message-Id: <20220121071937.1968651-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220108184518.3774572-4-christian.melki@t2data.com> References: <20220108184518.3774572-4-christian.melki@t2data.com> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] pciutils: Update to accomodate for hwdata package. X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Christian Melki Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as e61ccbcad6537c02ae00477507ef2c6655f22907. Michael [sent from post-receive hook] On Fri, 21 Jan 2022 08:19:36 +0100, Christian Melki wrote: > Make pciutils depend on hwdata-pci files. > > Remove compression as all utils may not be able to read > compressed .ids files. > > Remove update-pciids script. This is done by updating > hwdata now. > > Remove installation of pci.ids, provided by hwdata. > > Signed-off-by: Christian Melki > Message-Id: <20220108184518.3774572-4-christian.melki@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/pciutils.in b/rules/pciutils.in > index 9f9e93ee7ed9..b4607916fbe4 100644 > --- a/rules/pciutils.in > +++ b/rules/pciutils.in > @@ -1,7 +1,8 @@ > ## SECTION=shell_and_console > menuconfig PCIUTILS > - select ZLIB if PCIUTILS_COMPRESS > - select LIBKMOD if PCIUTILS_LIBKMOD > + select LIBKMOD if PCIUTILS_LIBKMOD > + select HWDATA if !SYSTEMD_HWDB > + select HWDATA_PCI if !SYSTEMD_HWDB > tristate > prompt "pciutils " > help > @@ -36,13 +37,5 @@ config PCIUTILS_LIBPCI > help > Generate and install the shared libpci library. > > -config PCIUTILS_COMPRESS > - bool > - default y > - prompt "compress pci_ids" > - help > - Save storage space by compressing the pci-id database. Access will > - be a little bit slower then. > - > endif > > diff --git a/rules/pciutils.make b/rules/pciutils.make > index 6f472e63d1f2..0e6cad59d372 100644 > --- a/rules/pciutils.make > +++ b/rules/pciutils.make > @@ -39,7 +39,6 @@ PCIUTILS_MAKE_OPT := \ > SBINDIR=/usr/bin \ > HOST=$(PTXCONF_ARCH_STRING)-linux \ > RELEASE=$(KERNEL_HEADER_VERSION) \ > - ZLIB=$(call ptx/yesno, PTXCONF_PCIUTILS_COMPRESS) \ > LIBKMOD=$(call ptx/yesno, PTXCONF_PCIUTILS_LIBKMOD) \ > SHARED=$(call ptx/yesno, PTXCONF_PCIUTILS_LIBPCI) \ > STRIP= \ > @@ -67,20 +66,12 @@ $(STATEDIR)/pciutils.targetinstall: > ifdef PTXCONF_PCIUTILS_TOOLS > @$(call install_copy, pciutils, 0, 0, 0755, -, /usr/bin/lspci) > @$(call install_copy, pciutils, 0, 0, 0755, -, /usr/bin/setpci) > - @$(call install_copy, pciutils, 0, 0, 0755, -, /usr/bin/update-pciids) > endif > > ifdef PTXCONF_PCIUTILS_LIBPCI > @$(call install_lib, pciutils, 0, 0, 0644, libpci) > endif > > -ifdef PTXCONF_PCIUTILS_COMPRESS > - @$(call install_copy, pciutils, 0, 0, 0644, -, \ > - /usr/share/pci.ids.gz, n) > -else > - @$(call install_copy, pciutils, 0, 0, 0644, -, \ > - /usr/share/pci.ids, n) > -endif > @$(call install_finish, pciutils) > > @$(call touch) _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de