From patchwork Wed Jan 10 17:16:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 58770 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 B877A27BBEB; Wed, 10 Jan 2024 17:18:34 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS 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 C0A4B27BBE2 for ; Wed, 10 Jan 2024 17:18:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNcDN-0000wJ-Du; Wed, 10 Jan 2024 12:18:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rNcDM-0000vr-BF for guix-patches@gnu.org; Wed, 10 Jan 2024 12:18:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNcDL-00048m-Vo for guix-patches@gnu.org; Wed, 10 Jan 2024 12:18:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNcDK-0004mF-Fl for guix-patches@gnu.org; Wed, 10 Jan 2024 12:18:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68263] [PATCH v2 1/2] gnu: libsmbios: Restrict to only supported systems. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 17:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68263 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68263@debbugs.gnu.org Cc: Vagrant Cascadian , Mathieu Othacehe , Efraim Flashner Received: via spool by 68263-submit@debbugs.gnu.org id=B68263.170490703618281 (code B ref 68263); Wed, 10 Jan 2024 17:18:02 +0000 Received: (at 68263) by debbugs.gnu.org; 10 Jan 2024 17:17:16 +0000 Received: from localhost ([127.0.0.1]:42701 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNcCZ-0004kh-L7 for submit@debbugs.gnu.org; Wed, 10 Jan 2024 12:17:16 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:39042) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNcCY-0004kM-Cy for 68263@debbugs.gnu.org; Wed, 10 Jan 2024 12:17:14 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 69FB3659C0; Wed, 10 Jan 2024 17:17:10 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo09-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo09-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 53qCOiaRqhDg; Wed, 10 Jan 2024 17:17:09 +0000 (UTC) Received: from jupiter.smallsystems.net (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id D72F8659E0; Wed, 10 Jan 2024 17:17:08 +0000 (UTC) From: Simon South Date: Wed, 10 Jan 2024 12:16:54 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/hardware.scm (libsmbios)[supported-systems]: New field. Change-Id: I8d813f496b7d2ffa8b0af2a6c814d1b09d731387 --- gnu/packages/hardware.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 59b95ab7c8..4765d1c55d 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -806,6 +806,7 @@ (define-public libsmbios also provides extensions for proprietary methods of interfacing with Dell specific SMBIOS tables.") (home-page "https://github.com/dell/libsmbios") + (supported-systems (list "i686-linux" "x86_64-linux")) (license (list license:osl2.1 license:gpl2+ license:bsd-3 license:boost1.0)))) From patchwork Wed Jan 10 17:16:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 58769 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 870AA27BBEA; Wed, 10 Jan 2024 17:18:34 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS 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 0722E27BBEB for ; Wed, 10 Jan 2024 17:18:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNcDO-0000wM-3K; Wed, 10 Jan 2024 12:18:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rNcDM-0000vk-5Q for guix-patches@gnu.org; Wed, 10 Jan 2024 12:18:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNcDL-00048j-RM for guix-patches@gnu.org; Wed, 10 Jan 2024 12:18:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNcDK-0004m8-1n for guix-patches@gnu.org; Wed, 10 Jan 2024 12:18:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68263] [PATCH v2 2/2] gnu: fwupd: Depend on libsmbios only on supported systems. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 17:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68263 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68263@debbugs.gnu.org Cc: Vagrant Cascadian , Mathieu Othacehe , Efraim Flashner Received: via spool by 68263-submit@debbugs.gnu.org id=B68263.170490703518274 (code B ref 68263); Wed, 10 Jan 2024 17:18:02 +0000 Received: (at 68263) by debbugs.gnu.org; 10 Jan 2024 17:17:15 +0000 Received: from localhost ([127.0.0.1]:42699 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNcCZ-0004kf-BK for submit@debbugs.gnu.org; Wed, 10 Jan 2024 12:17:15 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:38992) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNcCX-0004kL-Sr for 68263@debbugs.gnu.org; Wed, 10 Jan 2024 12:17:14 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 941FB659E6; Wed, 10 Jan 2024 17:17:09 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo09-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo09-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CQ7jssYZQwl4; Wed, 10 Jan 2024 17:17:09 +0000 (UTC) Received: from jupiter.smallsystems.net (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 158C6659E2; Wed, 10 Jan 2024 17:17:09 +0000 (UTC) From: Simon South Date: Wed, 10 Jan 2024 12:16:55 -0500 Message-ID: <2ee10a7ee9f4a6b2eea6cfa85e1d613538b33c8e.1704906299.git.simon@simonsouth.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/firmware.scm (fwupd)[inputs]: Add libsmbios conditionally. Change-Id: Id34135b180f5ee6e7abd2fd4eb10e0d3c6308e06 --- gnu/packages/firmware.scm | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index e691bf33da..75294fadf4 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -31,6 +31,7 @@ (define-module (gnu packages firmware) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix memoization) #:use-module (guix packages) + #:use-module (guix platform) #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix utils) @@ -283,21 +284,27 @@ (define-public fwupd `(,glib "bin") help2man gettext-minimal)) - (inputs (list bash-completion - libgudev - libxmlb - sqlite - polkit - eudev - libelf - tpm2-tss - cairo - efivar - pango - protobuf-c - mingw-w64-tools - libsmbios - gnu-efi)) + (inputs (append + (list bash-completion + libgudev + libxmlb + sqlite + polkit + eudev + libelf + tpm2-tss + cairo + efivar + pango + protobuf-c + mingw-w64-tools + gnu-efi) + (if (supported-package? libsmbios + (or (and=> (%current-target-system) + platform-target->system) + (%current-system))) + (list libsmbios) + '()))) ;; In Requires of fwupd*.pc. (propagated-inputs (list curl gcab