From patchwork Thu Mar 10 09:31:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37717 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D3D8F27BBEA; Thu, 10 Mar 2022 09:33:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 95F0127BBE9 for ; Thu, 10 Mar 2022 09:33:21 +0000 (GMT) Received: from localhost ([::1]:46814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nSFAe-0001K3-NN for patchwork@mira.cbaines.net; Thu, 10 Mar 2022 04:33:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nSFAN-0001Hd-Sr for guix-patches@gnu.org; Thu, 10 Mar 2022 04:33:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39317) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nSFAN-0005Pb-Jj for guix-patches@gnu.org; Thu, 10 Mar 2022 04:33:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nSFAN-0002Wr-GR for guix-patches@gnu.org; Thu, 10 Mar 2022 04:33:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v3 4/7] gnu: pciutils: Unbundle pci.ids and use latest. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Mar 2022 09:33:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54069@debbugs.gnu.org Cc: John Kehayias , Ludovic =?utf-8?q?Court?= =?utf-8?q?=C3=A8s?= , Maxime Devos , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.16469047679633 (code B ref 54069); Thu, 10 Mar 2022 09:33:03 +0000 Received: (at 54069) by debbugs.gnu.org; 10 Mar 2022 09:32:47 +0000 Received: from localhost ([127.0.0.1]:33198 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSFA7-0002VJ-J5 for submit@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:47 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:34882) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSFA5-0002V2-HR for 54069@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:46 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [80.241.60.245]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4KDkPM4ppGz9sks; Thu, 10 Mar 2022 10:32:39 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1646904757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mIdm/DZN9elqrSdPNkI6GwtW3ryHQx5St81iJ8XjCyA=; b=XWDQ+BuK9ck+6S/Jrb0yew+sogpMKWcA6BH2qZfANNruXHDnJkWaqliAeTOuPHkJkd9ioZ +v1/tTxIhTnFAjLr9ReR/oEOXyNf9LDMe0cpOcyqlmBbwADteDQHZdYh09IFAjDwjm9m89 gvuJkrh3NqA1IF9lkj9sA3Pnh3gdGXPoH2r7jibf9xGMXXOXCMnRgdy4JAjMwInA5f8pKa TqXCCJcM/ve8hpFBZkYVGzCo3mQjW8+0jk9LWtaf6/j9sg3Vy7GpQP9f/6RVFV/n3zfd5w fBThdftFGhZZ/9ieLvpuOOHpf98Qyq1mRALiEVt22HHeDktOM1zpbglZ1ionGA== Date: Thu, 10 Mar 2022 20:31:42 +1100 Message-Id: <20220310093145.31649-5-mail@brendan.scot> In-Reply-To: <20220310093145.31649-1-mail@brendan.scot> References: <20220310093145.31649-1-mail@brendan.scot> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/pciutils.scm (pciutils): [inputs]: Add hwdata:pci for latest pci.ids file. [arguments]: Don't install update-pciids script or it's man page. Don't install bundled old pci.ids file, use hwdata instead. Copy the pci.ids over so it can be gzipped. --- gnu/packages/pciutils.scm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index 41ba10f1e1..648d1385e4 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -93,8 +93,13 @@ (define-public pciutils (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'unbundle-pci.ids + (lambda* (#:key inputs outputs #:allow-other-keys) + (copy-file (string-append (assoc-ref inputs "hwdata:pci") + "/share/hwdata/pci.ids") + "pci.ids"))) (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) ;; There's no 'configure' script, just a raw makefile. (substitute* "Makefile" ,@(if (%current-target-system) @@ -124,13 +129,19 @@ (define-public pciutils (("^SHARED=.*$") ;; Build libpciutils.so. "SHARED := yes\n") + (("^ZLIB=.*$") ;; Ask for zlib support, for 'pci.ids.gz' decompression. "ZLIB := yes\n") (("^IDSDIR=.*$") ;; Installation directory of 'pci.ids.gz'. - "IDSDIR = $(SHAREDIR)/hwdata\n")))) + "IDSDIR = $(SHAREDIR)/hwdata\n") + ;; Don't install update script or its man page, + ((".*INSTALL.*update-pciids .*") "") + (("update-pciids update-pciids.8 ") "") + (("(.*INSTALL.*)(update-pciids.8)(.*)" _ a _ b) + (string-append a b))))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) ;; Install the commands, library, and .pc files. @@ -159,7 +170,8 @@ (define-public pciutils ,@(if (hurd-target?) `(("hurd-patch" ,(search-patch "pciutils-hurd-fix.patch"))) '()) - ("zlib" ,zlib))) + ("zlib" ,zlib) + ("hwdata:pci" ,hwdata "pci"))) (home-page "https://mj.ucw.cz/sw/pciutils/") (synopsis "Programs for inspecting and manipulating PCI devices") (description