From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id eMj/ABs3GmIPrQAAgWs5BA (envelope-from ) for ; Sat, 26 Feb 2022 15:20:11 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id +K/wORo3GmI2jQAA9RJhRA (envelope-from ) for ; Sat, 26 Feb 2022 15:20:10 +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 86F9435260 for ; Sat, 26 Feb 2022 15:20:10 +0100 (CET) Received: from localhost ([::1]:51430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNxvd-00072U-Nb for larch@yhetil.org; Sat, 26 Feb 2022 09:20:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58704) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNxvX-00071o-EY for guix-patches@gnu.org; Sat, 26 Feb 2022 09:20:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60691) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNxvX-0005fc-68 for guix-patches@gnu.org; Sat, 26 Feb 2022 09:20:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nNxvX-0007gN-05 for guix-patches@gnu.org; Sat, 26 Feb 2022 09:20:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v2 2/4] gnu: pciutils: Unbundle pci.ids and use latest. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Feb 2022 14:20: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 Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164588518029483 (code B ref 54069); Sat, 26 Feb 2022 14:20:02 +0000 Received: (at 54069) by debbugs.gnu.org; 26 Feb 2022 14:19:40 +0000 Received: from localhost ([127.0.0.1]:54587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNxvA-0007fT-5e for submit@debbugs.gnu.org; Sat, 26 Feb 2022 09:19:40 -0500 Received: from mail-qk1-f174.google.com ([209.85.222.174]:39920) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNxv5-0007ev-5l for 54069@debbugs.gnu.org; Sat, 26 Feb 2022 09:19:35 -0500 Received: by mail-qk1-f174.google.com with SMTP id t21so6915230qkg.6 for <54069@debbugs.gnu.org>; Sat, 26 Feb 2022 06:19:35 -0800 (PST) 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=8E9jYS504ANrbbR3RH0OqWCdTifGkgPWdTuhlcz4+YU=; b=II6zEhhug0LqIPDBhHV5SeHywpRwaTwWiYDGrH2iOqpbg0lxVAk8nXH3xkT6GrXvsF VATaLQOVOON7yhEMVoMuWVbLnpwAZlQtRFqbO7HQ5uctrL2vtekb1/8mO4xLButH/0HX ytpfGDCZYy/6ZGiXEKVWgR90K4mvO64et6MUBqQ4/kqcF8CG0+jE4RkP2Ry8Lrc2sdxC K/CgfXojYooUeY47jBRpHwttMMeKSTI/4avvjFNrDCxJlzDiMVIKDzOsLgk295bQ5xmU KKncnc0ocgaVchjgWEXv6dtsQWmLzx4Q/+mwT1jGzlmF5jwtuawgIsH02GE2c+ekrF3H PRPw== 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=8E9jYS504ANrbbR3RH0OqWCdTifGkgPWdTuhlcz4+YU=; b=PKE4VeFttszN71XkWI2bCAwKpQcHXE5r8duyJtr0bPRDkxGVHYeoEgEbkfV70sP1vF dYUwxQ8FVPeVLO01LVgXugIGxLU2fQKuP2v6T91BkusyaypGpgMkrE8YwqFNYNpFA/+6 hwJHvuQd+1MgzMqq/Xpk0VtVh+mUV8vLCrGygfIlPbry3ELCY88YMvkQ2VqSe6yNh/iP Vg7BCaXzs1hNdOYMyzfA8jWMyJU50bywUXmSarMZSn+1m6H/554g1M5bFz27WbTRRqBL SmilHcaFEavGZ3FJGmJjFgTxkgtizbLxKzdJJN6zu4r771Js1oIjtyA+hPz1JR8jfjVu /EPA== X-Gm-Message-State: AOAM5304+NoFvfJxDcE3e241bMyxtIoU68FW/1wRmYd6JXsLHfZGLd8H De4dz3OizqA4WYFENTpXYRg= X-Google-Smtp-Source: ABdhPJwkJbNr9idgOh+/b+aTmrTD0fvsoKhGIsXpeSG3PmU5LVQgt1zjlZOh/3LTgHVgaXOJdpS/DQ== X-Received: by 2002:a37:9d92:0:b0:508:19df:5557 with SMTP id g140-20020a379d92000000b0050819df5557mr7419657qke.101.1645885169469; Sat, 26 Feb 2022 06:19:29 -0800 (PST) Received: from hurd (dsl-149-67.b2b2c.ca. [66.158.149.67]) by smtp.gmail.com with ESMTPSA id w140-20020a376292000000b00648e88c1f05sm2605739qkb.67.2022.02.26.06.19.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Feb 2022 06:19:29 -0800 (PST) From: Maxim Cournoyer References: <20220226043238.2657-1-mail@brendan.scot> <20220226043238.2657-2-mail@brendan.scot> Date: Sat, 26 Feb 2022 09:19:28 -0500 In-Reply-To: <20220226043238.2657-2-mail@brendan.scot> (Brendan Tildesley's message of "Sat, 26 Feb 2022 15:32:36 +1100") Message-ID: <874k4lww0f.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-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1645885210; 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=8E9jYS504ANrbbR3RH0OqWCdTifGkgPWdTuhlcz4+YU=; b=U0IFIBq6Btgo9MspShXtyqVk73zcvs9IJiLj/cuLjnRZzXMJcqfiO58ffTmt+cd0jvNH8e va1K6AfPBeidcWj0uiYLsLtwBwQ4OisuTMbDFtibiXoSOCPlsMr1AwUwHnRrMAbo0z6A+2 QYe6EFIIyjPprGENGTpVz5HSQDB1xuK+CGqVcThDlDg6Qyueb8aL0RXjuKehovDxzjb5/r 5tICJObLZU9mBL4vElxO+QykmHYYhP1kinPdtTQ8ane7vs4fdjo330Ofj56g4jq1yD95rs 3ribsph5MIwMLyXK2HhENcmqEF1YqFMgUkyUKoSgxNLbcUHuvmRk3hhw7mK8KA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1645885210; a=rsa-sha256; cv=none; b=E2rk8jZY6K9WUF8mCgF++jxMokDSO2iruIRAoHbYgr2ATEQHReLbsdNQQEgTq6FVLMoC8z b8xyIwVARZtLyTk89Ia92Vh6ulW2vYEfplsPBDC8BZXH1fbGvpxqeCfxb9Wyr8FlBD6t3c 5lxe/zk+/OTQQXX2hBuk3MR2S9gQBzwiE7kkh1LsEkDDFLGjAiFdC5X70ig85jMxwXlW0Q 9NfHuQa5eYyixKctbp/6EEyc2AlPX1sSlD+DgY8Nv1y/xtH4U9dj6Z0N6eWFxXICmrhc9c NPeF92+ZQxrKDNY+zgmzTGm2GYG9ltn93tMn9vfe4Iu5aV5XErrIojFqXBZgPg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=II6zEhhu; 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.88 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=II6zEhhu; 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: 86F9435260 X-Spam-Score: 4.88 X-Migadu-Scanner: scn0.migadu.com X-TUID: exciSgV5gF9M Hi Brendan, Brendan Tildesley writes: > * 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 Thank you for refreshing this series. It's starting to look good! For pciutils though, what I had in mind was more like this: 1. copy hwdata's pci.ids *over* pciutils one after unpack. This means hwdata can be a simple native-input and no run time reference gets registered. 2. This would leave the rest of the build unaltered, so that our pciutils package could still be smaller thanks to the gzip'd pci.ids.gz (generated at build time from the version copied from hwdawa). Does this makes sense? Thanks again, Maxim