all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: Brendan Tildesley <mail@brendan.scot>
Cc: John Kehayias <john.kehayias@protonmail.com>, 54069@debbugs.gnu.org
Subject: [bug#54069] [PATCH v2 2/4] gnu: pciutils: Unbundle pci.ids and use latest.
Date: Sat, 26 Feb 2022 09:19:28 -0500	[thread overview]
Message-ID: <874k4lww0f.fsf@gmail.com> (raw)
In-Reply-To: <20220226043238.2657-2-mail@brendan.scot> (Brendan Tildesley's message of "Sat, 26 Feb 2022 15:32:36 +1100")

Hi Brendan,

Brendan Tildesley <mail@brendan.scot> 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




  reply	other threads:[~2022-02-26 14:20 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-20  9:53 [bug#54069] [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest Brendan Tildesley
2022-02-20  9:55 ` [bug#54069] [PATCH 1/2] gnu: Add hwdata Brendan Tildesley
2022-02-20  9:55   ` [bug#54069] [PATCH 2/2] gnu: pciutils: Unbundle pci.ids and use latest Brendan Tildesley
2022-02-21 19:40     ` [bug#54069] [PATCH 0/2] " Maxim Cournoyer
2022-02-22  8:40       ` Brendan Tildesley
2022-02-24  3:32   ` Maxim Cournoyer
2022-02-25  4:44     ` Brendan Tildesley
2022-02-26  5:00       ` Maxim Cournoyer
2022-02-21 16:19 ` John Kehayias via Guix-patches via
2022-02-22 19:34   ` John Kehayias via Guix-patches via
2022-02-22 21:00     ` Maxim Cournoyer
2022-02-22 21:22       ` John Kehayias via Guix-patches via
2022-02-23  1:08         ` Maxim Cournoyer
2022-02-23  6:16           ` John Kehayias via Guix-patches via
2022-02-26  4:32 ` [bug#54069] [PATCH v2 1/4] gnu: Add hwdata Brendan Tildesley
2022-02-26  4:32   ` [bug#54069] [PATCH v2 2/4] gnu: pciutils: Unbundle pci.ids and use latest Brendan Tildesley
2022-02-26 14:19     ` Maxim Cournoyer [this message]
2022-02-26  4:32   ` [bug#54069] [PATCH v2 3/4] gnu: libosinfo: Unbundle usb.ids, pci.ids Brendan Tildesley
2022-02-26 11:21     ` Maxime Devos
2022-02-27  1:37       ` Brendan Tildesley
2022-02-27 10:46         ` Maxime Devos
2022-02-27 10:56           ` Maxime Devos
2022-02-27 21:23             ` Ludovic Courtès
2022-02-27 22:17               ` Maxime Devos
2022-02-28 11:48                 ` Ludovic Courtès
2022-02-27 22:18               ` Maxime Devos
2022-02-27 12:12     ` Maxime Devos
2022-02-26  4:32   ` [bug#54069] [PATCH v2 4/4] gnu: libpciaccess: Use hwdata for pci.ids Brendan Tildesley
2022-02-26 23:14   ` [bug#54069] [PATCH v2 1/4] gnu: Add hwdata Maxim Cournoyer
2022-02-27 12:08     ` Maxime Devos
2022-03-10  9:31 ` [bug#54069] [PATCHES v3 0/7]: Update and make use of hwdata Brendan Tildesley
2022-03-10  9:31   ` [bug#54069] [PATCH v3 1/7] gnu: hwdata: Set #:target #f Brendan Tildesley
2022-03-10  9:31   ` [bug#54069] [PATCH v3 2/7] gnu: hwdata: Remove unused gzip native-input Brendan Tildesley
2022-03-10  9:31   ` [bug#54069] [PATCH v3 3/7] gnu: hwdata: Update to 0.357 Brendan Tildesley
2022-03-10  9:31   ` [bug#54069] [PATCH v3 4/7] gnu: pciutils: Unbundle pci.ids and use latest Brendan Tildesley
2022-03-23  1:57     ` [bug#54069] [PATCH 0/2] " Maxim Cournoyer
2022-03-10  9:31   ` [bug#54069] [PATCH v3 5/7] gnu: libosinfo: Unbundle usb.ids, pci.ids Brendan Tildesley
2022-03-23  2:14     ` bug#54069: [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest Maxim Cournoyer
2022-03-10  9:31   ` [bug#54069] [PATCH v3 6/7] gnu: libosinfo: Use this-package-input Brendan Tildesley
2022-03-10  9:31   ` [bug#54069] [PATCH v3 7/7] gnu: libpciaccess: Use hwdata for pci.ids Brendan Tildesley
2022-03-22 22:02     ` [bug#54069] [PATCH 0/2] gnu: pciutils: Unbundle pci.ids and use latest Maxim Cournoyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=874k4lww0f.fsf@gmail.com \
    --to=maxim.cournoyer@gmail.com \
    --cc=54069@debbugs.gnu.org \
    --cc=john.kehayias@protonmail.com \
    --cc=mail@brendan.scot \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.