From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id uKGwHdCtGWKXygAAgWs5BA (envelope-from ) for ; Sat, 26 Feb 2022 05:34:24 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 6M5pFtCtGWKXCgEAG6o9tA (envelope-from ) for ; Sat, 26 Feb 2022 05:34:24 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E450E328BF for ; Sat, 26 Feb 2022 05:34:23 +0100 (CET) Received: from localhost ([::1]:36332 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNoml-00027w-5C for larch@yhetil.org; Fri, 25 Feb 2022 23:34:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40882) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNomR-00027C-1H for guix-patches@gnu.org; Fri, 25 Feb 2022 23:34:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60176) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNomQ-00083o-Ne for guix-patches@gnu.org; Fri, 25 Feb 2022 23:34:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nNomQ-0005XK-L4 for guix-patches@gnu.org; Fri, 25 Feb 2022 23:34:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v2 2/4] gnu: pciutils: Unbundle pci.ids and use latest. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Feb 2022 04:34:02 +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 , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164584999321176 (code B ref 54069); Sat, 26 Feb 2022 04:34:02 +0000 Received: (at 54069) by debbugs.gnu.org; 26 Feb 2022 04:33:13 +0000 Received: from localhost ([127.0.0.1]:54065 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNolc-0005VT-LJ for submit@debbugs.gnu.org; Fri, 25 Feb 2022 23:33:13 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]:47118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNolW-0005UX-EO for 54069@debbugs.gnu.org; Fri, 25 Feb 2022 23:33:11 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (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-102.mailbox.org (Postfix) with ESMTPS id 4K5DK81mPZz9sS9; Sat, 26 Feb 2022 05:33:00 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1645849978; 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=sp/iG8C6CEPjIqBgr1FFcDmcF+gwqbvM16U66N7q0ok=; b=YLm/ipcG03SiHX13uYxZ9fVRJR99VutJWWGrAVBnKCLnUTLGseoU42r7mS7pyg+cPcWNf8 STfwnd1faxw/VSkZOhTvPpL9HO7dArXgtm9W88TnQt++hh4FsKS8ONRxEjJPjZqzxKXuoZ JLLLoShn7hTAZ0AEUasRWg2LRzOApaNLdFPSGhoOtm4XcC/5SPHfXxkIt09f2ltAOV+r4G 5K9XtBAub4ZaM56yQZzh3wjAKh9T0eAVIVYmIUrbiwW4OSdD8bZ/a6/VXa/R8tSQ3CD+St LYZQQrebNZddM64SiJDpOlq+svG6jCpmeUVSFcQM2xtIW3nfo2u5ujXc/kDERA== Date: Sat, 26 Feb 2022 15:32:36 +1100 Message-Id: <20220226043238.2657-2-mail@brendan.scot> In-Reply-To: <20220226043238.2657-1-mail@brendan.scot> References: <20220226043238.2657-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1645850063; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=sp/iG8C6CEPjIqBgr1FFcDmcF+gwqbvM16U66N7q0ok=; b=TlpxJsKLsxpf9aOkyragmW2oC5t4cwR+RmU8rnlRFvPiVLAVMc2inymaqjtFTmVzG2SU8o RzFvghlqsuctBqRKTUrT2LKdqjK6Uwpp2SPrvWEKcvN5FlQ2C8OYIyEHrvOTpX6vRi5lbU 7Yzx9mFaV9vP2VQaAjt5qiyXFS6uI2jAO6ETAhW/WQ/gOoQgQ6xMgdl7l2u2xMnyggJy4s XTQN8oWC8SJUU+M88AGKAaQ13686rj0mItsFTVL947Tx61b8yLF+9i8WaRcowVf2C6VkOA WOt4JMCpUycKqV27qOVBl3h3DMO/XVLQL9ox+OM77X+tMSQ1tNnrU2D0TGI5bQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1645850063; a=rsa-sha256; cv=none; b=uc41A4OtkXUBeNLbPiBxmRG9yzzfs64v7EKZ4uS3jXcwYA/Ht/SvpB1ZMo13PmcXlasyT1 o/DMBIwD81qd8f187WhfbvJNPuLTQlXWXq4asaptze0eG04iVZaapJZivZj571tIOMU/rz oMnYDmAZV/21uiKEd6FZRfx2x0/SKjvkyWRl72E81qh/2Zw8u799+0+QvyFsQNfxYLW1Kv 3AgChUi0jexsmuaC2X/rsb1DhHXVfrXPi+/Y7QU4jVMWvfJr45PLwkaDq1t/H+bOhHHBYJ ZpVpu+8/pNHQztKTOwNLj2QltYK9OKPQpus0NFM4XZ3FsafyAEBlgs/2rYIdOQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=brendan.scot header.s=MBO0001 header.b="YLm/ipcG"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 1.08 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=brendan.scot header.s=MBO0001 header.b="YLm/ipcG"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: E450E328BF X-Spam-Score: 1.08 X-Migadu-Scanner: scn0.migadu.com X-TUID: Fe1+4pTpeMBW * gnu/packages/pciutils.scm (pciutils): [inputs]: Add hwdata:pci for latest pci.ids file. Remove zlib since the ids files aren't gzipped. [arguments]: Don't install update-pciids script or it's man page. Don't install bundled old pci.ids file, use hwdata instead. --- gnu/packages/pciutils.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index f16f420ec2..f7969e0c4d 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -92,7 +92,7 @@ (define-public pciutils `(#:phases (modify-phases %standard-phases (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) @@ -122,13 +122,16 @@ (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")))) + (string-append "IDSDIR = " (assoc-ref inputs "hwdata:pci") "share/hwdata\n")) + ;; Don't install update script, its man page, or old bundled pci.ids file. + ((".*INSTALL.*update-pciids .*") "") + (("update-pciids update-pciids.8 ") "") + (("(.*INSTALL.*)(update-pciids.8)(.*)" _ a _ b) + (string-append a b)) + ((".*INSTALL.*PCI_IDS.*") "")))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) ;; Install the commands, library, and .pc files. @@ -157,7 +160,7 @@ (define-public pciutils ,@(if (hurd-target?) `(("hurd-patch" ,(search-patch "pciutils-hurd-fix.patch"))) '()) - ("zlib" ,zlib))) + ("hwdata:pci" ,hwdata "pci"))) (home-page "https://mj.ucw.cz/sw/pciutils/") (synopsis "Programs for inspecting and manipulating PCI devices") (description -- 2.34.0