From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id EGYKB4pAUGWibQEAauVa8A:P1 (envelope-from ) for ; Sun, 12 Nov 2023 04:03:38 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id EGYKB4pAUGWibQEAauVa8A (envelope-from ) for ; Sun, 12 Nov 2023 04:03:38 +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 B67825F4FC for ; Sun, 12 Nov 2023 04:03:37 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1699758218; a=rsa-sha256; cv=none; b=XTOmMNMwMwpK+aBvlxKfj5cRTgLGnabmm4FOebXTJnmEJR7A5X057GwKLM4HQfJJ9oD1gF ZoNycwZPmS7C4Z1QN+r9ZyIWYZh84B9QIcE/q3Xyaeyg0BCiqqX/SSn1nmgbdfrSmnLQqP RcZxPgUU49pOVXCEMZ+RC+oNPdTrVvRJvh/IszXY8v36anDRsLzt1JnBVDB/U/HjMlU4KO GOVFMToWESj/40bmxHX62FAyURfQsHPO8eAMpGFslFryZOAe/baKcQAbqWrV/xBOI/MUX8 QXbqYrPwWpDymE/ii92dsdAgclriFOHbTJII5rYzKnTbVZKb3vV9gk14KJ+gxA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1699758218; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: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; bh=wME2/BfB6i43sTlEYQ8MRs7aIn3pWZdzaoHMUk8d+lQ=; b=X6/lBAESbdH7CD/7wuNAmHpnwGPMevbAGNdn//Dh+Dn2nSpBOjWzHwkVNgKIfV+K/aoMQJ dEtY0LLtMg6mEaaZ8nGjVPVLqpBlnkUu8FrWzoev23RhQiMtuB0tpO1XpwwxE4IxilmKk4 ODVFv6T21N6QH45KZk5iZNHzZIo0i8eiyVELrfakiJsYBNu3OD+PWxwesMfa5UJahKDy+d rWby2Yfz2wLJh76Lk/H6vQHf3tpZru9MVmwt5k0z0ILLZ8nwlL4uX84vAccmV1Ant0bm4I JTX2B0x0nuTDw7srtgpPr8wArKgTEvmAYsrytehxjaYd6ggd/uz+W1ewKuge2w== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r20kt-00038B-W9; Sat, 11 Nov 2023 22:03:24 -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 1r20ks-00037z-0Z for guix-patches@gnu.org; Sat, 11 Nov 2023 22:03:22 -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 1r20kr-0002Hc-On for guix-patches@gnu.org; Sat, 11 Nov 2023 22:03:21 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r20lW-0000B1-Cu for guix-patches@gnu.org; Sat, 11 Nov 2023 22:04:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67119] [PATCH 2/4] gnu: ovmf: Add OVMF_CODE and OVMF_VARS files. References: In-Reply-To: Resent-From: spacecadet@purge.sh Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Nov 2023 03:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67119 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67119@debbugs.gnu.org Received: via spool by 67119-submit@debbugs.gnu.org id=B67119.1699758187610 (code B ref 67119); Sun, 12 Nov 2023 03:04:02 +0000 Received: (at 67119) by debbugs.gnu.org; 12 Nov 2023 03:03:07 +0000 Received: from localhost ([127.0.0.1]:54724 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r20kc-00009m-Ui for submit@debbugs.gnu.org; Sat, 11 Nov 2023 22:03:07 -0500 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:58719) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r20ka-00009H-S1 for 67119@debbugs.gnu.org; Sat, 11 Nov 2023 22:03:05 -0500 Received: by mail.gandi.net (Postfix) with ESMTPA id C7D881C0003 for <67119@debbugs.gnu.org>; Sun, 12 Nov 2023 03:02:17 +0000 (UTC) MIME-Version: 1.0 Date: Sun, 12 Nov 2023 03:02:17 +0000 From: spacecadet@purge.sh Message-ID: X-Sender: spacecadet@purge.sh Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit X-GND-Sasl: spacecadet@purge.sh 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: B67825F4FC X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -6.21 X-Spam-Score: -6.21 X-TUID: n46g8OiZRarI Add OVMF_CODE.fd and OVMF_VARS.fs to outputs as ovmf_code_arch.bin and ovmf_vars_arch.bin, respectively, for both ia32 and x64 architectures. --- gnu/packages/firmware.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index fd8b6bb8f0..53b89e4d90 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -954,12 +954,17 @@ (define-public ovmf (let ((fmw (string-append #$output "/share/firmware")) (toolchain-ver #$toolchain-ver)) (mkdir-p fmw) - (copy-file (string-append "Build/OvmfIa32/RELEASE_" toolchain-ver "/FV/OVMF.fd") - (string-append fmw "/ovmf_ia32.bin")) - #$@(if (string=? "x86_64-linux" (%current-system)) - '((copy-file (string-append "Build/OvmfX64/RELEASE_" toolchain-ver "/FV/OVMF.fd") - (string-append fmw "/ovmf_x64.bin"))) - '()))))))) + (for-each + (lambda (file) + (copy-file (string-append "Build/OvmfIa32/RELEASE_" toolchain-ver "/FV/" file ".fd") + (string-append fmw "/" (string-downcase file) "_ia32.bin")) + #$@(if (string=? "x86_64-linux" (%current-system)) + '((copy-file (string-append "Build/OvmfX64/RELEASE_" toolchain-ver "/FV/" file ".fd") + (string-append fmw "/" (string-downcase file) "_x64.bin"))) + '())) + (list "OVMF" + "OVMF_CODE" + "OVMF_VARS")))))))) (native-inputs `(("acpica" ,acpica) ("gcc@5" ,gcc-5) -- 2.41.0