From patchwork Sat Feb 26 04:32:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37458 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 61F3427BBEA; Sat, 26 Feb 2022 04:34:39 +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 9140127BBE9 for ; Sat, 26 Feb 2022 04:34:38 +0000 (GMT) Received: from localhost ([::1]:36906 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNomz-0002Y5-MH for patchwork@mira.cbaines.net; Fri, 25 Feb 2022 23:34:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNomR-00027B-0Y for guix-patches@gnu.org; Fri, 25 Feb 2022 23:34:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60175) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNomQ-00083h-C5 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-0005XD-9Y for guix-patches@gnu.org; Fri, 25 Feb 2022 23:34:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v2 1/4] gnu: Add hwdata. References: <635599986.289572.1645350831631@office.mailbox.org> In-Reply-To: <635599986.289572.1645350831631@office.mailbox.org> 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.164584998821156 (code B ref 54069); Sat, 26 Feb 2022 04:34:02 +0000 Received: (at 54069) by debbugs.gnu.org; 26 Feb 2022 04:33:08 +0000 Received: from localhost ([127.0.0.1]:54062 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNolY-0005V9-A6 for submit@debbugs.gnu.org; Fri, 25 Feb 2022 23:33:08 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:46916) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNolV-0005UV-VN for 54069@debbugs.gnu.org; Fri, 25 Feb 2022 23:33:07 -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-101.mailbox.org (Postfix) with ESMTPS id 4K5DK74ngrz9sSc; Sat, 26 Feb 2022 05:32:59 +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-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZHRXsluTMAREtph1WiKdD24JGxv0QdYzv69RND/TwqI=; b=rAsWWuxF/6YIZGv0SKFY9HZzrppVmJU2bSidrfrMaMsKlXBNfkihfnlB3MzkQ+CNYMJ0RS w0MGgWxWlZ2mXaPkCTKDwHQo+xRrkoDgtIQ8Vy9I/Ur9DSBoKDw/c/vmYRShveOgRG9tN4 auY7QTtSY1aqZhvJhIjFEMYfpYvup4LNSoBNu9uhrE8kD4t53z4sVbzyPMLIsj/6Wv5JCD iLm6/l7ZTlUKVEXIgbVh2Df8NLrHfXRVVW3MGbExmEKypx0ZPvBEgHIosTHfWqYoI8bB+t OGg+ZC0ZYDADe8v4lR3W2qMPNCbiG5bmrWWmkeEq1OLB4eqBeZ1X/9eOF3RTyQ== Date: Sat, 26 Feb 2022 15:32:35 +1100 Message-Id: <20220226043238.2657-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 (hwdata): New variable. --- gnu/packages/pciutils.scm | 41 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index b6b1e3ad85..f16f420ec2 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2022 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,11 +22,14 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages pciutils) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) + #:use-module (guix git-download) #:use-module (guix build-system gnu) + #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages pkg-config) @@ -33,6 +37,43 @@ (define-module (gnu packages pciutils) #:use-module (gnu packages linux) #:use-module (gnu packages base)) +(define-public hwdata + (package + (name "hwdata") + (version "0.356") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vcrhonek/hwdata") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0m04d93dwiplwp9v74nhnc0hyi2n007mylkg8f0frb46z5qjrpl3")))) + (build-system gnu-build-system) + (outputs '("out" "iab" "oui" "pci" "pnp" "usb")) + (native-inputs (list gzip)) + (arguments + ;; Tests require pciutils, python, podman. Disable to avoid recursive dep. + (list + #:tests? #f + #:configure-flags #~(list (string-append "--datadir=" #$output "/share")) + #:phases + #~(modify-phases %standard-phases + (replace 'install + (lambda _ + (install-file "iab.txt" (string-append #$output:iab "/share/hwdata")) + (install-file "oui.txt" (string-append #$output:oui "/share/hwdata")) + (install-file "pci.ids" (string-append #$output:pci "/share/hwdata")) + (install-file "pnp.ids" (string-append #$output:pnp "/share/hwdata")) + (install-file "usb.ids" (string-append #$output:usb "/share/hwdata"))))))) + (home-page "https://github.com/vcrhonek/hwdata") + (synopsis "Hardware identification and configuration data") + (description "@code{hwdata} contains various hardware identification and + configuration data, such as the @file{pci.ids} and @file{usb.ids} databases.") + (license (list license:gpl2+ + license:expat)))) ;XFree86 1.0 + (define-public pciutils (package (name "pciutils") From patchwork Sat Feb 26 04:32:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37455 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 B0EF427BBEB; Sat, 26 Feb 2022 04:34:22 +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 4FFD727BBEA for ; Sat, 26 Feb 2022 04:34:22 +0000 (GMT) Received: from localhost ([::1]:36332 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNomj-00027w-Ca for patchwork@mira.cbaines.net; Fri, 25 Feb 2022 23:34:21 -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 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. 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 From patchwork Sat Feb 26 04:32:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37457 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 9F04D27BBEA; Sat, 26 Feb 2022 04:34:28 +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 527B227BBE9 for ; Sat, 26 Feb 2022 04:34:26 +0000 (GMT) Received: from localhost ([::1]:36390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNomn-0002Ad-Fh for patchwork@mira.cbaines.net; Fri, 25 Feb 2022 23:34:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40884) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNomR-00027Q-In for guix-patches@gnu.org; Fri, 25 Feb 2022 23:34:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60177) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNomR-00083u-Ag for guix-patches@gnu.org; Fri, 25 Feb 2022 23:34:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nNomR-0005XS-0c for guix-patches@gnu.org; Fri, 25 Feb 2022 23:34:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v2 3/4] gnu: libosinfo: Unbundle usb.ids, pci.ids. 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.164584999621195 (code B ref 54069); Sat, 26 Feb 2022 04:34:02 +0000 Received: (at 54069) by debbugs.gnu.org; 26 Feb 2022 04:33:16 +0000 Received: from localhost ([127.0.0.1]:54068 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNolg-0005Vn-66 for submit@debbugs.gnu.org; Fri, 25 Feb 2022 23:33:16 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:59218) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNold-0005V2-3o for 54069@debbugs.gnu.org; Fri, 25 Feb 2022 23:33:13 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (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-201.mailbox.org (Postfix) with ESMTPS id 4K5DKH21l5z9sTd; Sat, 26 Feb 2022 05:33:07 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1645849984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZaHH8ZFC2m2Bu8t8vk5GLp+Ge/HgyY0OL217zp99/ok=; b=m8/cOV8sKkkJvX9Gij6m8wBmXyyEqVRm9zzXBPoEoRaTsYfwBhluya3NT/p5a30jEG9P10 J6x6fSuKdTPEPqEKo9mcPFPbjpWY1+rYXvwm1dB2amgl1AcQ2+6CLw8eu/UJJwsp7v1lP9 3yr5LrcosXeGFZ4NQQNAcQ3xMVHEaO2xUWM5MZma6Eg8fqXMuzdRoriE1O4h+FDI86MvcI seS91SGvRbMtNMUrfK86xKafFppmryg/KMrin7wMyFj9KWM1Gpb4ux/vJsInkTdmWJBjS6 v/tRHWnaxOZgBQiOgrIJJ7EgdT12Bjj4hyNpnLUrIQ0wY1rhw5SVmp2upSioQQ== Date: Sat, 26 Feb 2022 15:32:37 +1100 Message-Id: <20220226043238.2657-3-mail@brendan.scot> In-Reply-To: <20220226043238.2657-1-mail@brendan.scot> References: <20220226043238.2657-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/virtualization.scm (libosinfo): [arguments]: Use Gexp style. Use hwdata package for latest usb.ids and pci.ids. [inputs]: Add hwdata:pci, hwdata:usb. remove pci.ids, usb.ids origins. Use new input style. --- gnu/packages/virtualization.scm | 64 ++++++++++++++------------------- 1 file changed, 26 insertions(+), 38 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 506ebe4bc2..c890b43a3e 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2021 Petr Hodina ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2022 Oleg Pykhalov +;;; Copyright © 2022 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -98,6 +99,7 @@ (define-module (gnu packages virtualization) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages package-management) #:use-module (gnu packages perl) + #:use-module (gnu packages pciutils) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) @@ -1027,46 +1029,32 @@ (define-public libosinfo "0nd360c9ampw8hb6xh5g45q858df2r4jj9q88bcl6gzgaj0l3wxl")))) (build-system meson-build-system) (arguments - `(#:configure-flags - (list (string-append "-Dwith-usb-ids-path=" - (assoc-ref %build-inputs "usb.ids")) - (string-append "-Dwith-pci-ids-path=" - (assoc-ref %build-inputs "pci.ids"))) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-osinfo-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "osinfo/osinfo_loader.c" - (("path = DATA_DIR.*") - (string-append "path = \"" (assoc-ref inputs "osinfo-db") - "/share/osinfo\";")))))))) + (list + #:configure-flags + #~(list + (string-append "-Dwith-usb-ids-path=" #$hwdata:usb "/share/hwdata/usb.ids") + (string-append "-Dwith-pci-ids-path=" #$hwdata:pci "/share/hwdata/pci.ids")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-osinfo-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "osinfo/osinfo_loader.c" + (("path = DATA_DIR.*") + (string-append "path = \"" #$osinfo-db "/share/osinfo\";")))))))) (inputs - `(("libsoup" ,libsoup-minimal-2) - ("libxml2" ,libxml2) - ("libxslt" ,libxslt) - ("osinfo-db" ,osinfo-db))) + (list libsoup-minimal-2 + libxml2 + libxslt + osinfo-db)) (native-inputs - `(("glib" ,glib "bin") ; glib-mkenums, etc. - ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc/stable) - ("vala" ,vala) - ("intltool" ,intltool) - ("pkg-config" ,pkg-config) - ("pci.ids" - ,(origin - (method url-fetch) - (uri "https://github.com/pciutils/pciids/raw/ad02084f0bc143e3c15e31a6152a3dfb1d7a3156/pci.ids") - (sha256 - (base32 - "0kfhpj5rnh24hz2714qhfmxk281vwc2w50sm73ggw5d15af7zfsw")))) - ("usb.ids" - ,(origin - (method url-fetch) - (uri "https://svn.code.sf.net/p/linux-usb/repo/trunk/htdocs/usb.ids?r=2681") - (file-name "usb.ids") - (sha256 - (base32 - "1m6yhvz5k8aqzxgk7xj3jkk8frl1hbv0h3vgj4wbnvnx79qnvz3r")))))) + (list `(,glib "bin") ; glib-mkenums, etc. + gobject-introspection + gtk-doc/stable + vala + intltool + pkg-config + `(,hwdata "pci") + `(,hwdata "usb"))) (home-page "https://libosinfo.org/") (synopsis "Operating system information database") (description "libosinfo is a GObject based library API for managing From patchwork Sat Feb 26 04:32:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37456 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 EA0C627BBEA; Sat, 26 Feb 2022 04:34:25 +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 A8FE627BBE9 for ; Sat, 26 Feb 2022 04:34:25 +0000 (GMT) Received: from localhost ([::1]:36348 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNoml-000293-Gg for patchwork@mira.cbaines.net; Fri, 25 Feb 2022 23:34:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40886) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNomR-00027W-Ma for guix-patches@gnu.org; Fri, 25 Feb 2022 23:34:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60178) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNomR-000841-Ed for guix-patches@gnu.org; Fri, 25 Feb 2022 23:34:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nNomR-0005XZ-CV for guix-patches@gnu.org; Fri, 25 Feb 2022 23:34:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v2 4/4] gnu: libpciaccess: Use hwdata for pci.ids. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Feb 2022 04:34: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 , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164585000221213 (code B ref 54069); Sat, 26 Feb 2022 04:34:03 +0000 Received: (at 54069) by debbugs.gnu.org; 26 Feb 2022 04:33:22 +0000 Received: from localhost ([127.0.0.1]:54070 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNoll-0005W4-HL for submit@debbugs.gnu.org; Fri, 25 Feb 2022 23:33:21 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:46922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNola-0005Uv-OG for 54069@debbugs.gnu.org; Fri, 25 Feb 2022 23:33:20 -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-101.mailbox.org (Postfix) with ESMTPS id 4K5DKF2TYDz9sTj; Sat, 26 Feb 2022 05:33:05 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1645849983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fyKbFmRYWH04Q30NYoCpr2IESdxVpC6jHCM41BR4KOI=; b=GCfgi7mz0x9hlVwPm3oFXk3M8Hxx3GoBhTiGBkEtSz5sOPQ3xAGxYsuw+5DLejY+vemU+I TSmHjAW+21WgZqyirMvoCCtRJgxFnXgPbc2co56rzu5BQmuBzJrrY/k6pyEC3I3ggPLwvM FIANIHnQWLUsLQ9hqiP+xFuNklyEqLZIQAmWHZAwlNIv6D+FSNvYddRXgupbWrCbm7uwcp 1FLOpvYNeLMMQRp1mrFuPXLz63FWS/2p3Jku2sBwlTvTZObPrFFkqgPoEMawQ1IX2ctJOB 2MpjwFzX0cOlHD+COSCmvFGX0qsVe8StfHvxuQc5fqxcMGS2ET6dn3vlZ6xDyQ== Date: Sat, 26 Feb 2022 15:32:38 +1100 Message-Id: <20220226043238.2657-4-mail@brendan.scot> In-Reply-To: <20220226043238.2657-1-mail@brendan.scot> References: <20220226043238.2657-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/xorg.scm (libpciaccess): [arguments]: Remove zlib support since pci.ids isn't gzipped. Use Gexp. [inputs]: Add hwdata:pci, remove zlib, pciutils. [native-inputs]: Remove pkg-config since zlib isn't used. --- gnu/packages/xorg.scm | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 14e35d19ae..99ef114e9c 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 qblade ;;; Copyright © 2021 Lu Hui +;;; Copyright © 2022 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -1150,36 +1151,16 @@ (define-public libpciaccess (method url-fetch) (uri (string-append "mirror://xorg/individual/lib/libpciaccess-" - version - ".tar.bz2")) + version ".tar.bz2")) (sha256 (base32 "12glp4w1kgvmqn89lk19cgr6jccd3awxra4dxisp7pagi06rsk11")))) (build-system gnu-build-system) (arguments - '(;; Make sure libpciaccess can read compressed 'pci.ids' files as - ;; provided by pciutils. - #:configure-flags - (list "--with-zlib" - (string-append "--with-pciids-path=" - (assoc-ref %build-inputs "pciutils") - "/share/hwdata")) - - #:phases - (modify-phases %standard-phases - (add-after 'install 'add-L-zlib - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Provide '-LZLIB/lib' next to '-lz' in the .la file. - (let ((zlib (assoc-ref inputs "zlib")) - (out (assoc-ref outputs "out"))) - (substitute* (string-append out "/lib/libpciaccess.la") - (("-lz") - (string-append "-L" zlib "/lib -lz"))) - #t)))))) - (inputs - (list zlib pciutils)) ;for 'pci.ids.gz' - (native-inputs - (list pkg-config)) + (list + #:configure-flags + #~(list (string-append "--with-pciids-path=" #$hwdata:pci "/share/hwdata")))) + (inputs (list `(,hwdata "pci"))) (home-page "https://www.x.org/wiki/") (synopsis "Xorg PCI access library") (description "Xorg Generic PCI access library.")