From patchwork Mon May 13 08:21:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 64387 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 99C0727BBEA; Mon, 13 May 2024 09:25:56 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=ham 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 812A027BBE2 for ; Mon, 13 May 2024 09:25:55 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6Qzj-0003Uu-Fc; Mon, 13 May 2024 04:25:15 -0400 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 1s6QzY-0003TA-3H for guix-patches@gnu.org; Mon, 13 May 2024 04:25:05 -0400 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 1s6QzX-0001JL-A3; Mon, 13 May 2024 04:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s6QzX-0001Vx-IY; Mon, 13 May 2024 04:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70913] [PATCH 08/11] gnu: Use new ovmf firmware packages. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: pelzflorian@pelzflorian.de, ludo@gnu.org, matt@excalamus.com, guix-patches@gnu.org Resent-Date: Mon, 13 May 2024 08:25:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70913 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70913@debbugs.gnu.org Cc: Efraim Flashner , Florian Pelz , Ludovic =?utf-8?q?Court=C3=A8s?= , Matthew Trzcinski X-Debbugs-Original-Xcc: Florian Pelz , Ludovic =?utf-8?q?Court=C3=A8s?= , Matthew Trzcinski Received: via spool by 70913-submit@debbugs.gnu.org id=B70913.17155886575739 (code B ref 70913); Mon, 13 May 2024 08:25:03 +0000 Received: (at 70913) by debbugs.gnu.org; 13 May 2024 08:24:17 +0000 Received: from localhost ([127.0.0.1]:59436 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6Qyk-0001UR-TK for submit@debbugs.gnu.org; Mon, 13 May 2024 04:24:17 -0400 Received: from mail-wr1-f45.google.com ([209.85.221.45]:60824) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6QyW-0001S5-8j for 70913@debbugs.gnu.org; Mon, 13 May 2024 04:24:02 -0400 Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-34dc8d3fbf1so3462445f8f.1 for <70913@debbugs.gnu.org>; Mon, 13 May 2024 01:23:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715588574; x=1716193374; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=XauqQHS+Y6jCdONMUW2klAWtHgdq3ljIOARsWRvqvbc=; b=iPYsL6PL6H491RcloKMXRB9gbP1o3DDS6kIBcmRxxaKGFofGZzO1qsrGaWAzoB59ne hpzCiBgZ7xyamyKcQzZ3D1PT+9OGSwHYtHy3PVIZMZRZQcE4VouJUa4fz3DpTiiNPWTD mFyH/Aj/NwaPahE/k8i4daKOMAjpt1mXXUnT9EyvIlWBMmlTp6ggb4e8pxW9bHe4StsS eiE/VXRK+nVuFykp1Mab/aKmUmMYJYgZ4hJsGsCpwnaWYuM2JnM9F1ZZBMlajugEHbfT 4sHxTfycgk+lIbdR8yeRQvrevPvQ+cCFnnjMJFqiAoWO0DDDFhp13+cEbt3tQDCNEcfx 6Yqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715588574; x=1716193374; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=XauqQHS+Y6jCdONMUW2klAWtHgdq3ljIOARsWRvqvbc=; b=SzcFRiNo9WvD89oiZcC7hQN8WcnDtxXQVUfUAv5odM99JKH2lOxNQ8v+uCjCtuI94R XFvrrqGvtrg6ZH6v6dXorDMufJuvTEpnf2W1WR73tM2ggdhrnQ15agcl/PVRKUGlUk9x RJl93Frtxy+S1upB3uYRsTISClAksXUkHWhXYKoQNZSEMA0LUIbtgHcows8wiyvUPnHq RtitM8bFHLH1CMXVaA/I0JT3TKbzaYh05eWNxTR/Z/AXE/E02zRHM2srsg4ddcf154Id rseIwoHAfOAJ8VTkFGvjKb6QeQg41L9lbZ2ULVYomklewJ5BbVVAQtwa6thkXt7X0Gx7 ujJQ== X-Gm-Message-State: AOJu0YwlYIIm+7OVkkH8SgfTaJVB0w5clSzEQuqrLGBNsmgXzEZhav7R C1VKDQtYhRiCBSvThV8xUzTt6/0XtGV9gADd0Bo0tDsmUKvFDbnEjJvIVU7O X-Google-Smtp-Source: AGHT+IEV+UoTdPq7glrQ1UNUtFQ5UcQrUGUjjyXQf5AD/jRAura2NF/2gPogF7Kmb/AS4SiEXvMcOA== X-Received: by 2002:adf:f54d:0:b0:34d:d22c:71ae with SMTP id ffacd0b85a97d-3504a61c996mr7560500f8f.6.1715588574026; Mon, 13 May 2024 01:22:54 -0700 (PDT) Received: from localhost ([37.46.46.122]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3502baad1f0sm10585262f8f.89.2024.05.13.01.22.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 01:22:53 -0700 (PDT) From: Efraim Flashner Date: Mon, 13 May 2024 11:21:57 +0300 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 * doc/guix.texi (Invoking guix system): Update qemu command to use ovmf-x86-64. * gnu/packages/virtualization.scm (xen)[inputs]: Replace ovmf with ovmf-i686. * gnu/tests/install.scm (uefi-firmware): Use system appropriate ovmf firmware. Change-Id: Ia2ff76eaf766c8d4fb0be4a7cc7b8941574433d0 --- doc/guix.texi | 2 +- gnu/packages/virtualization.scm | 2 +- gnu/tests/install.scm | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index ce1a06747c..6058658996 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -42250,7 +42250,7 @@ Invoking guix system cp $image /tmp/my-image.qcow2 chmod +w /tmp/my-image.qcow2 qemu-system-x86_64 -enable-kvm -hda /tmp/my-image.qcow2 -m 1000 \ - -bios $(guix build ovmf)/share/firmware/ovmf_x64.bin + -bios $(guix build ovmf-x86-64)/share/firmware/ovmf_x64.bin @end example When using the @code{mbr-hybrid-raw} image type, a raw disk image is diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 34cccd6550..c701ae2d45 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -2670,7 +2670,7 @@ (define-public xen yajl ncurses openssl - ovmf + ovmf-i686 pixman qemu-minimal seabios diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 16da320000..6248faed9b 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -210,9 +210,9 @@ (define (uefi-firmware system) "Return the appropriate QEMU OVMF UEFI firmware for the given SYSTEM." (cond ((string-prefix? "x86_64" system) - (file-append ovmf "/share/firmware/ovmf_x64.bin")) + (file-append ovmf-x86-64 "/share/firmware/ovmf_x64.bin")) ((string-prefix? "i686" system) - (file-append ovmf "/share/firmware/ovmf_ia32.bin")) + (file-append ovmf-i686 "/share/firmware/ovmf_ia32.bin")) (else #f))) (define* (run-install target-os target-os-source