From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 1cY/Hrp+OmL8+gAAgWs5BA (envelope-from ) for ; Wed, 23 Mar 2022 02:58:18 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id oLhFFrp+OmIc8wAAG6o9tA (envelope-from ) for ; Wed, 23 Mar 2022 02:58:18 +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 0222128F58 for ; Wed, 23 Mar 2022 02:58:17 +0100 (CET) Received: from localhost ([::1]:41238 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nWqGO-0006JX-Ha for larch@yhetil.org; Tue, 22 Mar 2022 21:58:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nWqGB-0006JI-HJ for guix-patches@gnu.org; Tue, 22 Mar 2022 21:58:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48321) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nWqGA-0005vd-Ez for guix-patches@gnu.org; Tue, 22 Mar 2022 21:58:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nWqGA-000605-C7 for guix-patches@gnu.org; Tue, 22 Mar 2022 21:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Mar 2022 01:58: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: Brendan Tildesley Cc: John Kehayias , 54069@debbugs.gnu.org, Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxime Devos Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164800067423050 (code B ref 54069); Wed, 23 Mar 2022 01:58:02 +0000 Received: (at 54069) by debbugs.gnu.org; 23 Mar 2022 01:57:54 +0000 Received: from localhost ([127.0.0.1]:42218 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nWqG2-0005zi-HN for submit@debbugs.gnu.org; Tue, 22 Mar 2022 21:57:54 -0400 Received: from mail-qk1-f169.google.com ([209.85.222.169]:40897) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nWqG1-0005zT-Cc for 54069@debbugs.gnu.org; Tue, 22 Mar 2022 21:57:53 -0400 Received: by mail-qk1-f169.google.com with SMTP id i65so100977qkd.7 for <54069@debbugs.gnu.org>; Tue, 22 Mar 2022 18:57:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=p5fa0FoO5KGSuQU8atdHWhUApmV29f+Pu7zb0oWjKdc=; b=exBisEgjQcShVngNEfMiERXfPB72B1qgoHfk4p4qsQ0So8Kh+9rrX9J2qUBXCs8k6J RETBcXHLh2oQiYBH2ChGEq6ZQ/VS57rwgFySGyPaZdhqi53+mytyeqte6dqylxwWabwD B48HsZi42P3eknQm5RcX2IhSEWtgUGiexUmhE9ptV5VI9ayacYP9cyRIkZFqJ6l+ceA2 m8PoGgwIAI0yQ1hZC2HxR8tTuKGxgwT6Zkh7drwcjNSVFpfzEf7Bfmt7519/UKuyUUlO 68jeWrS1l/ReDr4ZFc+JCiw5z/6D6TzyYV5q7zU+SA2uv/sF88CvTW1T3lrskkO7rfxm bDeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=p5fa0FoO5KGSuQU8atdHWhUApmV29f+Pu7zb0oWjKdc=; b=3Rpq9t7so1quaewzGCBBi8UskoF8FGgg81qpQzV6qaO15yonGQ4+jE4h6WKrliCXYC hvdFfYkY71J/M1JzwBOY8Io3dlnF32lP6guw3iSriPEyaJksAZShfGnY5O/tJif4r6p5 LTv4U5hVRjpR8lENOgJPT6YCO6R0R0OdddOta0UpJkhWWdUwqrj9JXyW6tzmKkG9A8Br moP4nJ2jqyIiGyha1miTLNRrPyAYSRTUH9AzG7/ECPVT0m95pqJYMPKRztqWD9tbiXpl m+59zcp3PO5cxp+8Sq2LCPI7JPd4Hv2U0Qh2FrbxLFSNtBIqMbDnLIac+0n0iG+9p8PM 3KWg== X-Gm-Message-State: AOAM5322oy5fHjmcWUKTYpluiZD1WLuJ/NTwImCJGxP6eq4Tx7LVW3Wz 5B0gOBSVcqZu+B7B4EIz7rE= X-Google-Smtp-Source: ABdhPJyHatafAuiU5oD/OyYTJGAyU7Y/AtsevmMUKGfSTJXsWe04l05nKkxbkKijhOwNYJecfOAVDA== X-Received: by 2002:a37:de03:0:b0:67e:4c75:9a07 with SMTP id h3-20020a37de03000000b0067e4c759a07mr15197222qkj.121.1648000667650; Tue, 22 Mar 2022 18:57:47 -0700 (PDT) Received: from hurd (dsl-10-129-199.b2b2c.ca. [72.10.129.199]) by smtp.gmail.com with ESMTPSA id s16-20020ac85cd0000000b002e1ed82f1e5sm14612041qta.75.2022.03.22.18.57.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Mar 2022 18:57:47 -0700 (PDT) From: Maxim Cournoyer References: <20220310093145.31649-1-mail@brendan.scot> <20220310093145.31649-5-mail@brendan.scot> Date: Tue, 22 Mar 2022 21:57:45 -0400 In-Reply-To: <20220310093145.31649-5-mail@brendan.scot> (Brendan Tildesley's message of "Thu, 10 Mar 2022 20:31:42 +1100") Message-ID: <87mthh1ld2.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1648000698; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: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=p5fa0FoO5KGSuQU8atdHWhUApmV29f+Pu7zb0oWjKdc=; b=Z4Qo2lSwyfFQE8lnFxuAOFZFaNBzaAPUjtPM0YlCaYyhkclqJLn08NL1iB4jI0JrPS7I7T zmWMeeUmtPj/EvYelVS+yAMlmCxJbJkDvkn1hS+iFYXVfeq3MGg5kVcNvUc36y6Kc2V9CR pMQMDI8Ne/vDxXgQXxY1+wYvbQ48m59AWYGUWZraU79FH2l/d3hfImQ3WU8iGn7kqU78pe 8fM9wfNFLuqy2aI9jqkiQGHo8PlAt+dwg43KHVofKL3YPYvfBgZqEMFDKMuMFDeI8N0JQ0 Kbfwwz44AwIKIAGKHbALwcX/B/cEoFgDXfoRpWVsLTAdk6uunPbQe7uUIso/gQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1648000698; a=rsa-sha256; cv=none; b=Jr3xuzrgS/HpzNnGNxorqewJQaH8xXRR5WCEuIsPtqEfRtn4UiBSNsl8w5zEmpV6jL0e8m Qxldnpg0OGaxXe9t2A9u9oSoOd+LLq42ON02sQUp3/A7hmZQYKJKqiwhhYL2FdSXn2ABq6 KCwjI71ipJ9OSIAZKXaWwRZBxr1QS5QT+JHPIi/H6VTcWst+UEtXsLjalk790SPICa5cG9 JYozrqhyovjuykrnuSX7vwy65YtmAZQM9lo+rwal9rjCce/uL2K0Geulh5P3Z3nynMHmza hoYYyzx56SA+gsQpJujRYTfjeK0VT41Olz8IrFkzI1zYMiU6vkrSgc00KWd7Og== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=exBisEgj; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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: 4.80 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=exBisEgj; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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: 0222128F58 X-Spam-Score: 4.80 X-Migadu-Scanner: scn0.migadu.com X-TUID: Y+CRl3l+qdDv Hi Brendan, Brendan Tildesley writes: > * 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. The GNU changelog idea is to stick to changes in the commit message; if explanations are needed they can go in the code as comments. Alternatively, you can also put explanations as a paragraph between the commit summary (first line) and the changelog. > --- > 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) ^ not needed > + (copy-file (string-append (assoc-ref inputs "hwdata:pci") > + "/share/hwdata/pci.ids") > + "pci.ids"))) I used search-input-file, making sure to use (or native-inputs inputs) as its first argument, so that it works even when cross-compiling. > (replace 'configure > - (lambda* (#:key outputs #:allow-other-keys) > + (lambda* (#:key inputs outputs #:allow-other-keys) ^ not needed > ;; 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"))) I moved hwdata to native-inputs, And pushed as 387a9772c2571d4375d6c3682c7572d12e7ec5b2 to the core-updates branch. Thank you! Maxim