From patchwork Mon May 13 08:21:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 64383 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 C6AA627BBEA; Mon, 13 May 2024 09:24:27 +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 5883327BBE9 for ; Mon, 13 May 2024 09:24:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6Qyb-0002vw-JT; Mon, 13 May 2024 04:24:05 -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 1s6QyY-0002nk-NB for guix-patches@gnu.org; Mon, 13 May 2024 04:24:02 -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 1s6QyY-00018b-EB for guix-patches@gnu.org; Mon, 13 May 2024 04:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s6QyY-0001Si-5D; Mon, 13 May 2024 04:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70913] [PATCH 01/11] gnu: edk2-tools: Update to 202402. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Mon, 13 May 2024 08:24:02 +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 , Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 70913-submit@debbugs.gnu.org id=B70913.17155886355581 (code B ref 70913); Mon, 13 May 2024 08:24:02 +0000 Received: (at 70913) by debbugs.gnu.org; 13 May 2024 08:23:55 +0000 Received: from localhost ([127.0.0.1]:59405 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6QyO-0001Rv-PQ for submit@debbugs.gnu.org; Mon, 13 May 2024 04:23:54 -0400 Received: from mail-lj1-f179.google.com ([209.85.208.179]:47407) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6QyK-0001RY-3r for 70913@debbugs.gnu.org; Mon, 13 May 2024 04:23:51 -0400 Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-2e576057c56so19194671fa.3 for <70913@debbugs.gnu.org>; Mon, 13 May 2024 01:23:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715588561; x=1716193361; 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=qTO248Q2DqePLR+GZKFZLRwt8b/GwJEsxpIQTIvL5/4=; b=Mn2Xxgtw2O//GWj1R62u8vtlRjchRiLa3CisROjuQUp3lVzwCahtBrkF5axnGoQGdY QIVCIZN6VJvcKs1RUzNaRsvvpGAfODvoYj+o1IU2m8y56mO2a2eu1577Ps6X3Dpub7a+ tdMkZrMnGQpGeDtZMsdhUbThXYJ50hP38ldyfk3rUVMVztqZpLgFTggtoij6dfr3A9d2 78QoocxJUxrenlXYWzh0bd0efviqcaidZttWsn+efo4kdX56oRJmSZ3jbrzPqD0JQm7A 5hmgfCX6FDpg6QjFRRi3F9l747A3/Ljh79R9QMhVmit76McqPPWnfv5Lso1kEgFWg5dV FBjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715588561; x=1716193361; 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=qTO248Q2DqePLR+GZKFZLRwt8b/GwJEsxpIQTIvL5/4=; b=pYGkGxBnO7JBI2Nzl7DqlWexmDsUYdIcbzZOvcyTKwKQxCm6MWOz/hHUuEXmiJkRR0 vxenIb5ezf9o+bxtnIj3UQXySSFD5/rvg0vYPZsUumvJHQvWK8jxglz/C99ZaGUyyIKW hQsdGfXkudH4ad6AbDc2yc4fMC8ZJ5s5Ofi0JA3rNgv3zbPTYWprXe71sc17OJ6p1Iv1 5Us6R1amoAXa2xfr5Pgr6Z1yygkAHzSW7XpZJBIEH56B3k3KhdZDJFJwjZlPpbOfhoOA t4xU6nNhvJRdDdKgWkSmuCjugsBQgx0KpHo3Qp7TDwdks0QR+nQr2IpyT6h8N3wtsqzu G9VQ== X-Gm-Message-State: AOJu0YwO/XOfq8eIxp64t6hMkiTikezDPLq4/BASQiPb3+MCnYJRm04r 2dfVD4cCBF7+mFm7ANpPBOeaUwYLffYaVsDdHb/ItMIpkiZytOE4m+wSMmbj X-Google-Smtp-Source: AGHT+IHIS/l008oPGS0cHTyXwUg+FzlQ/jvi3GHuFakGt3+eabB99HAUUm593yQEXGfMavREUsmjlw== X-Received: by 2002:a2e:7219:0:b0:2d8:6606:9e61 with SMTP id 38308e7fff4ca-2e5203a1e5emr56285731fa.48.1715588561072; Mon, 13 May 2024 01:22:41 -0700 (PDT) Received: from localhost ([37.46.46.122]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-41fccee9318sm149196625e9.30.2024.05.13.01.22.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 01:22:40 -0700 (PDT) From: Efraim Flashner Date: Mon, 13 May 2024 11:21:50 +0300 Message-ID: <514375552dab803e7f23d31d2ffcb5c004beb0f5.1715588342.git.efraim@flashner.co.il> 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 (edk2-tools): Update to 202402. Change-Id: I3ab7d75a8193faea2b3b3649f9b14bba48611187 --- gnu/packages/firmware.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 6f0c2da806..62753e3769 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2017 David Craven -;;; Copyright © 2017, 2018, 2022, 2023 Efraim Flashner +;;; Copyright © 2017, 2018, 2022-2024 Efraim Flashner ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Vagrant Cascadian ;;; Copyright © 2019 Mathieu Othacehe @@ -814,7 +814,7 @@ (define-public sgabios (define-public edk2-tools (package (name "edk2-tools") - (version "202308") + (version "202402") (source (origin (method git-fetch) (uri (git-reference @@ -823,7 +823,7 @@ (define-public edk2-tools (file-name (git-file-name name version)) (sha256 (base32 - "19g3g94hayvcwmn6sjs6mghq0qf5nsd785k5j8szcrj2p0vjh54f")))) + "1x0h89cz3ihihcp4n93bw708q9r3icprb8cjsrrfcgq10clavdzx")))) (build-system gnu-build-system) (arguments (list #:make-flags From patchwork Mon May 13 08:21:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 64382 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 3446627BBEA; Mon, 13 May 2024 09:24:20 +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 1618027BBE2 for ; Mon, 13 May 2024 09:24:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6Qya-0002r6-59; Mon, 13 May 2024 04:24:04 -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 1s6QyY-0002nj-N2 for guix-patches@gnu.org; Mon, 13 May 2024 04:24:02 -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 1s6QyY-00018a-Dl for guix-patches@gnu.org; Mon, 13 May 2024 04:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s6QyY-0001So-Ms; Mon, 13 May 2024 04:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70913] [PATCH 02/11] gnu: edk2-tools: Enable submodules. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Mon, 13 May 2024 08:24:02 +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 , Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 70913-submit@debbugs.gnu.org id=B70913.17155886375602 (code B ref 70913); Mon, 13 May 2024 08:24:02 +0000 Received: (at 70913) by debbugs.gnu.org; 13 May 2024 08:23:57 +0000 Received: from localhost ([127.0.0.1]:59409 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6QyR-0001Ry-0K for submit@debbugs.gnu.org; Mon, 13 May 2024 04:23:57 -0400 Received: from mail-wr1-f45.google.com ([209.85.221.45]:58834) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6QyL-0001RZ-J7 for 70913@debbugs.gnu.org; Mon, 13 May 2024 04:23:52 -0400 Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-34ef66c0178so2771513f8f.1 for <70913@debbugs.gnu.org>; Mon, 13 May 2024 01:23:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715588563; x=1716193363; 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=zHQZWjnT3m5qLCUPmPnuafbdArCV14i6L8LPuuBmaoM=; b=VV3Fcx8YjGRI24t9K+YIQs6wp+/x0r3ZlwK28cey/4+S6ptUZSJBZN0tP2NgQNZiaF YeyxJdN3doNVVukhxmTTdpkR7PkbZFqbDrr0FCzvbxU1d4GHezVX9UrtQFNf6xaNUG+u I4jth7oHMohyFOXRtMOV4cAUiqlPwaEBzCmFY6fUoYs+hrvrOfMdKKYt4Vd4mXPgF+yb qEcG/88PhkCaXkYUnN/q1v0w9UKutTVZ5jhAGpuYjSTWq15YDV3sR84ac+70SVWs1NKT MvwRHxZNGTaWC9Ftp6I67ZrdQFkT1DHcx6EahVHU2o5wWNFpeCeBSmJW8jiXjTadkFtB jjBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715588563; x=1716193363; 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=zHQZWjnT3m5qLCUPmPnuafbdArCV14i6L8LPuuBmaoM=; b=gvBcAcWzNUoRhgjOexEhQjJTIcra24vxniWV7FttzrqqMFPiTQm9iBEVdqrbsOoIAj c8aXUl1ayU3XOsRkOjwq6i4SgVdq0H/F/38/kHT/K72n9r1GIzJz6Cc4ygSSyg4CPoPP AjtAXC5k1tOuqSGtXPvRovTaFQK7tuaqMmbXH5aWmNrykrm1KE9nKt0Vi02nLm8WoVhj Rm/4nMXxEL47ztn6xLSQtTx7AWOoRAW1IuUPWTb8nMV13wnj6w0oAM4J3+Dj81iUdxLU 7havkPrkAs5K/kpyyW9IVEbLOUPVTv1sEzh/3Tg2epp7QkR6UcjV3weUOxBQFC7g4AJB SGBw== X-Gm-Message-State: AOJu0Yx++bOOVB76KdANxWwN71aFD3tCuSLJRCgo4KCVZ1JyeSonm4qu Yk0VWUAzU9OtCYtb5XtxXCqIp49SwHeg4X0SRBheEvgWU44BnpaiJ+4gSrgQ X-Google-Smtp-Source: AGHT+IG79erE7YCD7qVxeTlPoURrQoc8mrJj+WRNFlCR4oi0g2xJmnH8AchPvO7hRLnLpZYIbx2NPA== X-Received: by 2002:a05:6000:1968:b0:34f:96ba:ca3a with SMTP id ffacd0b85a97d-3504a61c7cemr10798541f8f.13.1715588562892; Mon, 13 May 2024 01:22:42 -0700 (PDT) Received: from localhost ([37.46.46.122]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3502bbc5654sm10566636f8f.115.2024.05.13.01.22.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 01:22:42 -0700 (PDT) From: Efraim Flashner Date: Mon, 13 May 2024 11:21:51 +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 * gnu/packages/firmware.scm (edk2-tools)[source]: Checkout submodules. [arguments]: Don't disable building brotli or xz compression. Change-Id: I8b318373e38767e1a309e9e385f1626429bfbb20 --- gnu/packages/firmware.scm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 62753e3769..f3bb51bcb1 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -819,11 +819,13 @@ (define-public edk2-tools (method git-fetch) (uri (git-reference (url "https://github.com/tianocore/edk2") - (commit (string-append "edk2-stable" version)))) + (commit (string-append "edk2-stable" version)) + ;; EDK2 makes extensive use of submodules. + (recursive? #t))) (file-name (git-file-name name version)) (sha256 (base32 - "1x0h89cz3ihihcp4n93bw708q9r3icprb8cjsrrfcgq10clavdzx")))) + "0y7jfpijgi099znhzjklnsczn0k0vm1d1qznq9x2a2sa0glydsin")))) (build-system gnu-build-system) (arguments (list #:make-flags @@ -835,15 +837,6 @@ (define-public edk2-tools (add-after 'unpack 'change-directory (lambda _ (chdir "BaseTools"))) - (add-after 'change-directory 'disable-some-tools - (lambda _ - ;; Disable building brotli and xz, since we package them - ;; separately, and it would require fetching submodules. - (substitute* "Source/C/GNUmakefile" - (("^[[:blank:]]+BrotliCompress[[:blank:]]+\\\\") - "\\") - (("^[[:blank:]]+LzmaCompress[[:blank:]]+\\\\") - "\\")))) (replace 'build (lambda* (#:key (make-flags #~'()) #:allow-other-keys) ;; The default build target also runs tests. From patchwork Mon May 13 08:21:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 64391 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 B1A8227BBE2; Mon, 13 May 2024 09:26:05 +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,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 74DFC27BBE2 for ; Mon, 13 May 2024 09:26:02 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6Qzo-0003Vl-6T; Mon, 13 May 2024 04:25:20 -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 1s6QzZ-0003Ti-RI for guix-patches@gnu.org; Mon, 13 May 2024 04:25:07 -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 1s6QzY-0001Nt-3H for guix-patches@gnu.org; Mon, 13 May 2024 04:25:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s6QzY-0001WH-DU; Mon, 13 May 2024 04:25:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70913] [PATCH 03/11] gnu: Add ovmf-x86-64. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Mon, 13 May 2024 08:25:04 +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 , Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 70913-submit@debbugs.gnu.org id=B70913.17155886625755 (code B ref 70913); Mon, 13 May 2024 08:25:04 +0000 Received: (at 70913) by debbugs.gnu.org; 13 May 2024 08:24:22 +0000 Received: from localhost ([127.0.0.1]:59440 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6Qyq-0001Uf-3h for submit@debbugs.gnu.org; Mon, 13 May 2024 04:24:22 -0400 Received: from mail-wr1-f41.google.com ([209.85.221.41]:53388) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6QyN-0001Rc-6j for 70913@debbugs.gnu.org; Mon, 13 May 2024 04:24:05 -0400 Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-34da35cd01cso3764865f8f.2 for <70913@debbugs.gnu.org>; Mon, 13 May 2024 01:23:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715588565; x=1716193365; 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=RXza6De7SkR7SGuU2rSmgFqO5c20PeiSkh55XyCJhrw=; b=mJqdxfiX0XNtMwFLlykm/q5+pTmU51Jz9J7AEYENcaO1vskqayqwQ2bDN1Kbfm16HP 6pQol0zdqxSXEN3PJJR7hkcFBQqrsrRE1S4LS+zGE4NrAbh3KW+NQL5WMZw5wouh4Sg0 yCmZiI+5fbCJHjbyaGM0mNN3ytRYhDWM34JJ80pmi1yqJI9r7urDhN0ZapiHmN17GfSU kOUG83UhfePqfWsU4t8knLaHA5mcrN8FLMOwQ69b+/As1ekGVFNOk3XxJdRCtWU9zA+V st7wPV6hNVJ1B73V7w2wAkwOZ0bOX1ja2bzXMk1BvthJa1vyu68qiQpNoJnVhnL5nM3X mhgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715588565; x=1716193365; 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=RXza6De7SkR7SGuU2rSmgFqO5c20PeiSkh55XyCJhrw=; b=VH10tAp2ao3i7A29hLWJw9KVS4NcxxDHm0InN6JLwjka76RVY2rBMrAJVNh/15o67U Sj2j10SlMH1RLV0Ca19xlXRmO6YzIvQhV3ZyzG87kHJoVNKBrGKeInmxxca1k4xTme62 ioZphWE9EV6/L3eMAavARntv1zPib0m6zkdnYkq9NrKEYbXqtAVRRE5UAUjeFCc90GWp 2vqNVFbv9tUmU9vX2nODAD1xEAjrm/8gprAbRm8ZkAwozMSAEF67oLRsGD0sWmIz2PkE 0E9GHqMd3NKxgJWUjHQdnAf0vwEE28QiHPA8rOk5GdaqSo2NY1NqXI0+tuXE4detpBhD OqDQ== X-Gm-Message-State: AOJu0YyCQPqed5Su7fuYYVrU4ZzEomwFFIEqOxbxiD2kkeFymTPOeSGh cbQvEQhMFDp/hT+FEkCD5FhO3eTOU5IFu9VfJiq224JXp10GRBfjNk6qTDGf X-Google-Smtp-Source: AGHT+IG8WSPrpZsGOpdO8I2Vg/dkF0TtJiT6vXoj7brdd5L9WYKsNo3WwyoqM0M7j/YVgnAiHKB24w== X-Received: by 2002:a5d:6741:0:b0:34d:74cb:b048 with SMTP id ffacd0b85a97d-3504a73de83mr7520438f8f.34.1715588564637; Mon, 13 May 2024 01:22:44 -0700 (PDT) Received: from localhost ([37.46.46.122]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3502b8a78e8sm10591002f8f.61.2024.05.13.01.22.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 01:22:44 -0700 (PDT) From: Efraim Flashner Date: Mon, 13 May 2024 11:21:52 +0300 Message-ID: <95a7a669b300c7f80a703e08c4027ed56fee47d0.1715588342.git.efraim@flashner.co.il> 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 (make-ovmf-firmware): New procedure. (ovmf-x86-64): New variable. Change-Id: I283065577b5507f3b7d695eaa67a6d248174bcf5 --- gnu/packages/firmware.scm | 133 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index f3bb51bcb1..40ca541437 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -869,6 +869,139 @@ (define-public edk2-tools @end itemize") (license license:bsd-2))) +(define* (make-ovmf-firmware arch) + (let ((toolchain "GCC") + (arch-string (match arch + ("x86_64" "X64") + ("i686" "IA32") + ("aarch64" "AARCH64") + ("armhf" "ARM") + ("riscv64" "RISCV64") + ("loongarch64" "LOONGARCH64") + (_ "NONE")))) + (package + (inherit edk2-tools) + (name (string-append "ovmf-" arch)) + (arguments + (list + #:tests? #f ; No check target. + #:target #f ; Package produces firmware. + #:modules '((guix build gnu-build-system) + (guix build utils) + (ice-9 match)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* "edksetup.sh" + (("^return \\$\\?") + "exit $?")))) + (add-before 'configure 'set-env + (lambda _ + (unless (string-prefix? #$arch #$(%current-system)) + (setenv (string-append #$toolchain "_X64_PREFIX") + "x86_64-linux-gnu-") + (setenv (string-append #$toolchain "_IA32_PREFIX") + "i686-linux-gnu-") + (setenv (string-append #$toolchain "_AARCH64_PREFIX") + "aarch64-linux-gnu-") + (setenv (string-append #$toolchain "_ARM_PREFIX") + "arm-linux-gnueabihf-") + (setenv (string-append #$toolchain "_RISCV64_PREFIX") + "riscv64-linux-gnu-") + (setenv (string-append #$toolchain "_LOONGARCH64_PREFIX") + "loongarch64-linux-gnu-")))) + (replace 'configure + (lambda _ + (let* ((cwd (getcwd)) + (tools (string-append cwd "/BaseTools")) + (bin (string-append tools "/BinWrappers/PosixLike"))) + (setenv "WORKSPACE" cwd) + (setenv "EDK_TOOLS_PATH" tools) + (setenv "PYTHON3_ENABLE" "TRUE") + (setenv "PYTHON_COMMAND" "python3") + (setenv "PATH" (string-append (getenv "PATH") ":" bin)) + (invoke "bash" "edksetup.sh") + (substitute* "Conf/target.txt" + (("^TARGET[ ]*=.*$") "TARGET = RELEASE\n") + (("^TOOL_CHAIN_TAG[ ]*=.*$") + (string-append "TOOL_CHAIN_TAG = " #$toolchain "\n")) + (("^TARGET_ARCH[ ]*=.*$") + (string-append "TARGET_ARCH = " #$arch-string + "\n")) + (("^MAX_CONCURRENT_THREAD_NUMBER[ ]*=.*$") + (format #f "MAX_CONCURRENT_THREAD_NUMBER = ~a~%" + (number->string (parallel-job-count))))) + ;; Build build support. + (setenv "CC" "gcc") + (invoke "make" "-C" tools)))) + (replace 'build + (lambda _ + (invoke "build" "-a" #$arch-string "-t" #$toolchain "-p" + (match #$arch + ("x86_64" + "OvmfPkg/OvmfPkgX64.dsc") + ("i686" + "OvmfPkg/OvmfPkgIa32.dsc") + ((or "aarch64" "armhf") + "ArmVirtPkg/ArmVirtQemu.dsc") + ("riscv64" + "OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc") + (_ #t))))) + (add-before 'install 'install-efi-shell + (lambda _ + (let ((fmw (string-append #$output "/share/firmware"))) + (mkdir-p fmw) + (for-each + (lambda (file) + (copy-file file + (string-append fmw "/Shell_" + (string-downcase #$arch-string) + ".efi"))) + (find-files "Build" "Shell\\.efi")))))))) + (native-inputs + (append + (list acpica + nasm + perl + python-3 + (list util-linux "lib")) + (if (not (string-prefix? arch (%current-system))) + (if (string=? arch "armhf") + (list (cross-gcc "arm-linux-gnueabihf") + (cross-binutils "arm-linux-gnueabihf")) + (list (cross-gcc (string-append arch "-linux-gnu")) + (cross-binutils (string-append arch "-linux-gnu")))) + '()))) + (synopsis "UEFI firmware for QEMU") + (description "OVMF is an EDK II based project to enable UEFI support for +Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.") + (license (list license:expat + license:bsd-2 license:bsd-3 license:bsd-4))))) + +(define-public ovmf-x86-64 + (let ((base (make-ovmf-firmware "x86_64"))) + (package + (inherit base) + (name "ovmf-x86-64") + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'install + (lambda _ + (let ((fmw (string-append #$output "/share/firmware"))) + (mkdir-p fmw) + (for-each + (lambda (file) + (copy-file + (string-append "Build/OvmfX64/RELEASE_GCC" + "/FV/" file ".fd") + (string-append fmw "/" (string-downcase file) "_x64.bin"))) + (list "OVMF" + "OVMF_CODE" + "OVMF_VARS")))))))))))) + (define-public ovmf (let ((toolchain-ver "GCC5")) (package From patchwork Mon May 13 08:21:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 64390 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 D518E27BBED; Mon, 13 May 2024 09:26:02 +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 8DD4527BBEB for ; Mon, 13 May 2024 09:26:02 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6Qzj-0003VL-Py; 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 1s6QzV-0003So-VA for guix-patches@gnu.org; Mon, 13 May 2024 04:25:03 -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 1s6QzV-0001Is-M9 for guix-patches@gnu.org; Mon, 13 May 2024 04:25:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s6QzV-0001VP-NH; Mon, 13 May 2024 04:25:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70913] [PATCH 04/11] gnu: Add ovmf-i686. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Mon, 13 May 2024 08:25:01 +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 , Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 70913-submit@debbugs.gnu.org id=B70913.17155886455694 (code B ref 70913); Mon, 13 May 2024 08:25:01 +0000 Received: (at 70913) by debbugs.gnu.org; 13 May 2024 08:24:05 +0000 Received: from localhost ([127.0.0.1]:59412 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6QyT-0001SJ-A6 for submit@debbugs.gnu.org; Mon, 13 May 2024 04:24:05 -0400 Received: from mail-lj1-f178.google.com ([209.85.208.178]:45236) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6QyP-0001Rh-1Q for 70913@debbugs.gnu.org; Mon, 13 May 2024 04:23:55 -0400 Received: by mail-lj1-f178.google.com with SMTP id 38308e7fff4ca-2e27277d2c1so53277251fa.2 for <70913@debbugs.gnu.org>; Mon, 13 May 2024 01:23:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715588567; x=1716193367; 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=dmROcY+7FD5sEYUhtbd7sc/vmxo1tztadMlRWn0iL8o=; b=D/isAeXwnhqts3x2f6c6o+RQ/9UAoeO5qlfv39aFT+KJGQxCCwM2zRQIhvgx8W6tHT +DZGu9xNRuPs45jr8hdy+sxIjOpugaCYup7LUW4u3MeeUbTY6XiLcBPwMImTWeU/Chn+ bRNhtuJW69nqMRiaTEudzoCnvXsG8bC2dcrxuUwDNZ0X8HlURSyVfE3hNGLUIKdhXBaA Lx+L5Tsye4mwJqAdWlY25zx9LOtTz7vl682Rc3YikwiJxdEteaj2BHfwTWRj9tFKqkhY PMtL5b3VJVmSw5JFiIGVLeHHbhVLVlq2PgWidEKuEJzJFTsbMMW1Uoh1qkF7S2cAZYAD NvKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715588567; x=1716193367; 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=dmROcY+7FD5sEYUhtbd7sc/vmxo1tztadMlRWn0iL8o=; b=NmjFLKNK+FWtjeTtiFEkUr3xW1QS70KPhBILIL7XIjkeEahgy6Xkw54Si+dhvZninj rScEqtwhJbS4vJnueFhx+9TnV6mUt8g6zcjiMcrFB6GIpvnymiBCrzDgFLByyHSHneCp aG2Y50br/KyjHR0k8tZkFRNnJMQOHFsAgxt1ekiCT3dk44hanNATJuGU7XJmNfV4xRa/ zc7fR5Dpt38vMWIC0Hys41qvgtFnBvF8XrKuoXQ//nQ0xLClaYKEyPbw49yNZp0W9+Y/ 2PpVTTJjoxIWbZV+owfGwhu1Z31oJYLC4i4XvnOHdTshEzvmksB4ZUsjYttcpHOhvHxQ IwEw== X-Gm-Message-State: AOJu0YwXL6NOoMlJajozQ9CejOYslvolNE6zNb+8kZ2Lb2Psb6qgtQCS SuOWstt9EhzLtoo8n41cyvLszgeOV53O8je7vgP+ZTD0qRqKE4jviTuVDHRB X-Google-Smtp-Source: AGHT+IFz7X0SMb+xb7XkWddM4wPc9izGGO13xRV/Gv2d2z/Mo+zcv8oZ8mRi1xITvWFWkYvTXmD/yw== X-Received: by 2002:a2e:3511:0:b0:2e0:aaaa:e551 with SMTP id 38308e7fff4ca-2e5203a45eemr56917111fa.37.1715588566524; Mon, 13 May 2024 01:22:46 -0700 (PDT) Received: from localhost ([37.46.46.122]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3502b79bd09sm10443424f8f.14.2024.05.13.01.22.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 01:22:46 -0700 (PDT) From: Efraim Flashner Date: Mon, 13 May 2024 11:21:53 +0300 Message-ID: <12604f2b2e1d9c21d687e71b532f245bcc5913d4.1715588342.git.efraim@flashner.co.il> 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 (ovmf-i686): New variable. Change-Id: Ie5702435695e24ed1d2731152a89b0aeb9a050dd --- gnu/packages/firmware.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 40ca541437..ab39f8d0d2 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1002,6 +1002,28 @@ (define-public ovmf-x86-64 "OVMF_CODE" "OVMF_VARS")))))))))))) +(define-public ovmf-i686 + (let ((base (make-ovmf-firmware "i686"))) + (package + (inherit base) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'install + (lambda _ + (let ((fmw (string-append #$output "/share/firmware"))) + (mkdir-p fmw) + (for-each + (lambda (file) + (copy-file + (string-append "Build/OvmfIa32/RELEASE_GCC" + "/FV/" file ".fd") + (string-append fmw "/" (string-downcase file) "_ia32.bin"))) + (list "OVMF" + "OVMF_CODE" + "OVMF_VARS")))))))))))) + (define-public ovmf (let ((toolchain-ver "GCC5")) (package From patchwork Mon May 13 08:21:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 64385 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 927BD27BBEA; Mon, 13 May 2024 09:25:24 +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 CAB8727BBE2 for ; Mon, 13 May 2024 09:25:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6Qzh-0003UT-CZ; Mon, 13 May 2024 04:25:13 -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 1s6QzW-0003St-38 for guix-patches@gnu.org; Mon, 13 May 2024 04:25:03 -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 1s6QzV-0001Iu-QX for guix-patches@gnu.org; Mon, 13 May 2024 04:25:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s6QzW-0001VX-43; Mon, 13 May 2024 04:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70913] [PATCH 05/11] gnu: ovmf-aarch64: Update to 202402. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Mon, 13 May 2024 08:25:02 +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 , Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 70913-submit@debbugs.gnu.org id=B70913.17155886475711 (code B ref 70913); Mon, 13 May 2024 08:25:02 +0000 Received: (at 70913) by debbugs.gnu.org; 13 May 2024 08:24:07 +0000 Received: from localhost ([127.0.0.1]:59428 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6Qyb-0001Tn-53 for submit@debbugs.gnu.org; Mon, 13 May 2024 04:24:07 -0400 Received: from mail-wr1-f43.google.com ([209.85.221.43]:51381) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6QyQ-0001Ri-Hk for 70913@debbugs.gnu.org; Mon, 13 May 2024 04:23:57 -0400 Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-34e28e32ea4so2539649f8f.2 for <70913@debbugs.gnu.org>; Mon, 13 May 2024 01:23:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715588568; x=1716193368; 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=H0uT6h6OYPV62SNhKzlW6Qlsv3wXBkS8JIJ0xTczT3Q=; b=N2hRWaI53LtHPnXcOfXTpr8wIwUA89f3tQJCLl+upm4USlwKaa6f8aAF7ISRwyVW3H MsNaW7uEvHd11AF5wqX49zeG8PhCX9cD/BwHLKU6nPRPf8c5kc6Rge9A/Vy92NreSCtt Bdrmw0io2qVP1Bu2fJl0YYRREnoHhclToQkqHo2n2aBGbP17qXIUQYyye+pF7sQHxsLw g0UFnKdZNUSA+sIDmtIDd7Cfn2tUTi9J7CRHZMdpp/KMTWoHlvQMSFxTkeQqXVPRAufV w+C+pQgDrpb8gBUKzV5vfl/OS3Aa5PGxpMynzq9udu1FYkkdNupi4Atd/F+/jIwDv+rl ttaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715588568; x=1716193368; 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=H0uT6h6OYPV62SNhKzlW6Qlsv3wXBkS8JIJ0xTczT3Q=; b=pSa6Ovpx/d4o6MJ8c2dobepV97tAH/QrAprC+sAA/chrvL/AjeWsUhI6qP9ovUU60J EEqaufq2dRF50eBOkjnSlpv26hFLXvdZK4jpt5eVoXSdLtQ8GkUo6xLYzCMVo+yAV9uQ YMIq0l7d3Z0tuSALhWzX7SfOxxlotajzgRnmpJLo8AHwazD5U5ywFAGgUt6AeVdSsm3w D21QB5TsYKEVtp8AjpzM4+XIQpCzS9nFuhIz0maazZO9RQKOfGuW1x7j73vLZ9IZLjS6 25NJM9hq0dOK9XagBHKclp3zVWAk9Ey/EJBsbBevKaayZ65gUpqahdtSALHCMIdmX4Ma 43og== X-Gm-Message-State: AOJu0Ywj55py+XRW353/paGWY1/jTwGHBm3SsT4i85OgtHHBI3ipjJTN SioZKjPzryzHKvSmb51UlKIlpEEJB/+ADUuhkxK7OFbHRqXz858eOaBaLbO9 X-Google-Smtp-Source: AGHT+IEB7CCv9ydaV7n2wGga1FLhqFSCxmItkTNlVp0KIrG9TI6Jw8wfMXMOmU9BT8KoAUHhOhp6IQ== X-Received: by 2002:adf:fe88:0:b0:34c:1b7f:593b with SMTP id ffacd0b85a97d-3504a96a2e7mr5714765f8f.56.1715588568351; Mon, 13 May 2024 01:22:48 -0700 (PDT) Received: from localhost ([37.46.46.122]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3502b79be12sm10513693f8f.20.2024.05.13.01.22.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 01:22:48 -0700 (PDT) From: Efraim Flashner Date: Mon, 13 May 2024 11:21:54 +0300 Message-ID: <01a983b348c27fa91f69a950f1a622de8bf2ca62.1715588342.git.efraim@flashner.co.il> 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 (ovmf-aarch64): Update to 202402. Build using make-ovmf-firmware. Change-Id: I270bd8fa79f2df3d73bdf8d5685d27a3cc0cef6a --- gnu/packages/firmware.scm | 51 ++++++++++++--------------------------- 1 file changed, 16 insertions(+), 35 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index ab39f8d0d2..ae11c82d1a 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1024,6 +1024,22 @@ (define-public ovmf-i686 "OVMF_CODE" "OVMF_VARS")))))))))))) +(define-public ovmf-aarch64 + (let ((base (make-ovmf-firmware "aarch64"))) + (package + (inherit base) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'install + (lambda _ + (let ((fmw (string-append #$output "/share/firmware"))) + (mkdir-p fmw) + (copy-file (string-append "Build/ArmVirtQemu-AARCH64/" + "RELEASE_GCC/FV/QEMU_EFI.fd") + (string-append fmw "/ovmf_aarch64.bin")))))))))))) + (define-public ovmf (let ((toolchain-ver "GCC5")) (package @@ -1124,41 +1140,6 @@ (define-public ovmf (license (list license:expat license:bsd-2 license:bsd-3 license:bsd-4))))) -(define-public ovmf-aarch64 - (let ((toolchain-ver "GCC5")) - (package - (inherit ovmf) - (name "ovmf-aarch64") - (native-inputs - (append (package-native-inputs ovmf) - (if (not (string-prefix? "aarch64" (%current-system))) - `(("cross-gcc" ,(cross-gcc "aarch64-linux-gnu")) - ("cross-binutils" ,(cross-binutils "aarch64-linux-gnu"))) - '()))) - (arguments - (substitute-keyword-arguments (package-arguments ovmf) - ((#:phases phases) - #~(modify-phases #$phases - #$@(if (string-prefix? "aarch64" (%current-system)) - '() - #~((add-before 'configure 'set-env - (lambda _ - (setenv (string-append #$toolchain-ver "_AARCH64_PREFIX") - "aarch64-linux-gnu-"))))) - (replace 'build - (lambda _ - (invoke "build" "-a" "AARCH64" "-t" #$toolchain-ver - "-p" "ArmVirtPkg/ArmVirtQemu.dsc"))) - (delete 'build-x64) - (replace 'install - (lambda _ - (let ((fmw (string-append #$output "/share/firmware"))) - (mkdir-p fmw) - (copy-file (string-append "Build/ArmVirtQemu-AARCH64/RELEASE_" - #$toolchain-ver "/FV/QEMU_EFI.fd") - (string-append fmw "/ovmf_aarch64.bin"))))))))) - (supported-systems %supported-systems)))) - (define-public ovmf-arm (let ((toolchain-ver "GCC5")) (package From patchwork Mon May 13 08:21:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 64388 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 4857427BBEA; Mon, 13 May 2024 09:25:57 +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 A661C27BBE2 for ; Mon, 13 May 2024 09:25:56 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6Qzp-0003Wz-Ij; Mon, 13 May 2024 04:25:21 -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 1s6QzX-0003T7-OX for guix-patches@gnu.org; Mon, 13 May 2024 04:25:04 -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 1s6QzW-0001JI-CF for guix-patches@gnu.org; Mon, 13 May 2024 04:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s6QzW-0001Vh-LZ; Mon, 13 May 2024 04:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70913] [PATCH 06/11] gnu: ovmf-arm: Update to 202402. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Mon, 13 May 2024 08:25:02 +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 , Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 70913-submit@debbugs.gnu.org id=B70913.17155886515723 (code B ref 70913); Mon, 13 May 2024 08:25:02 +0000 Received: (at 70913) by debbugs.gnu.org; 13 May 2024 08:24:11 +0000 Received: from localhost ([127.0.0.1]:59431 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6Qye-0001U4-GN for submit@debbugs.gnu.org; Mon, 13 May 2024 04:24:10 -0400 Received: from mail-lj1-f174.google.com ([209.85.208.174]:54772) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6QyS-0001Rj-MI for 70913@debbugs.gnu.org; Mon, 13 May 2024 04:23:59 -0400 Received: by mail-lj1-f174.google.com with SMTP id 38308e7fff4ca-2e564cad1f6so24830681fa.1 for <70913@debbugs.gnu.org>; Mon, 13 May 2024 01:23:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715588570; x=1716193370; 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=VyMbcT+0kE4JvU5oARkD0ZBOOMIElQ4O6yyHQuMRNCY=; b=dt6ItY7SVo4M1C918KMQ0FleT38/p+Y4SZ0F08wAa7yyKSYxUFJuTPNpKCWk13kk7m gshWdVIuRxlInVBWKwlKZSCPc+3wnfCere4iRT6u4+sSKwLPALcF6RZrleWDdmGTHdbp elW7Lm7+BbdJEA6+w+2Ws8hK7zeHiLHDWuUAcr5sw6V6N01eqIJ4Gybko09V79J11avA wBvvUHF/41FAIlS1j5TgiEgF/pmRIPSmxTiHExMVD33SjwplJTG/0XfXiZQFPElXu31P bj45cV/lpW07WxUnc/FgUtSKx99sU7hLzONt9k7EmWccG/E/gVBR2lDb+OWfK24487R4 cIjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715588570; x=1716193370; 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=VyMbcT+0kE4JvU5oARkD0ZBOOMIElQ4O6yyHQuMRNCY=; b=VJmdp81qVmvSAa6HbJ4/G3FrSx5ImfN+XW0+dERciAIVSA8ODb/TXwcjoConUy6qJR zxGzfVEvtlVunrR7eaisBT+RuI4xfMDlClbpGbvkZhK1SZKWRo/drpn7ZjnysTpSkxC7 5BviKQOHWWOrm9CAIi2jalsKLzSSv52Qe2usVRPiPsqtjkryfd6XBv6DWWAfwPU3OOYL TX7Pd4V3jVKP5jaVRdct5rqTcW5M2lCPPtt7GYwz8c6DveBSOOdAS+yoZvWvaE7X9cOt 4BFwk0+KlfNQ1C8ljBMssbKFEaEJa556x5oCFnfmWe8cTwMXa73ENNyamNWPzCXelEjV 7xjQ== X-Gm-Message-State: AOJu0YwKyjtWgSTTLURcrbbn7NvX5Y+PzJx1NTehic0/1S+x/z1QNW4W aCTRrIfOTk/DXbzOzbrwWRVOdAVLhue1pE6xDY/jPPL85JH+rNdvGEUd3xJx X-Google-Smtp-Source: AGHT+IHvfIHYDc1BeqEe3kAAvnC48X32MS8PbeUGu9064VnsJv/iRVmRethDRllcciOw9xuR6Q+ccA== X-Received: by 2002:a05:651c:510:b0:2df:97b1:e21c with SMTP id 38308e7fff4ca-2e520066fa4mr69518011fa.31.1715588570175; Mon, 13 May 2024 01:22:50 -0700 (PDT) Received: from localhost ([37.46.46.122]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-41fd11ef80esm146047835e9.39.2024.05.13.01.22.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 01:22:49 -0700 (PDT) From: Efraim Flashner Date: Mon, 13 May 2024 11:21:55 +0300 Message-ID: <2a36840df037dc831a74879954f9d7407a57fc0a.1715588342.git.efraim@flashner.co.il> 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 (ovmf-arm): Update to 202402. Build using make-ovmf-firmware. Change-Id: I1adf1afc9ceb29db373c2e0d05d42a3c68232cb5 --- gnu/packages/firmware.scm | 52 +++++++++++++-------------------------- 1 file changed, 17 insertions(+), 35 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index ae11c82d1a..f660c21712 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1040,6 +1040,23 @@ (define-public ovmf-aarch64 "RELEASE_GCC/FV/QEMU_EFI.fd") (string-append fmw "/ovmf_aarch64.bin")))))))))))) +(define-public ovmf-arm + (let ((base (make-ovmf-firmware "armhf"))) + (package + (inherit base) + (name "ovmf-arm") + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'install + (lambda _ + (let ((fmw (string-append #$output "/share/firmware"))) + (mkdir-p fmw) + (copy-file (string-append "Build/ArmVirtQemu-ARM/" + "RELEASE_GCC/FV/QEMU_EFI.fd") + (string-append fmw "/ovmf_arm.bin")))))))))))) + (define-public ovmf (let ((toolchain-ver "GCC5")) (package @@ -1140,41 +1157,6 @@ (define-public ovmf (license (list license:expat license:bsd-2 license:bsd-3 license:bsd-4))))) -(define-public ovmf-arm - (let ((toolchain-ver "GCC5")) - (package - (inherit ovmf) - (name "ovmf-arm") - (native-inputs - (append (package-native-inputs ovmf) - (if (not (string-prefix? "armhf" (%current-system))) - `(("cross-gcc" ,(cross-gcc "arm-linux-gnueabihf")) - ("cross-binutils" ,(cross-binutils "arm-linux-gnueabihf"))) - '()))) - (arguments - (substitute-keyword-arguments (package-arguments ovmf) - ((#:phases phases) - #~(modify-phases #$phases - #$@(if (string-prefix? "armhf" (%current-system)) - '() - #~((add-before 'configure 'set-env - (lambda _ - (setenv (string-append #$toolchain-ver "_ARM_PREFIX") - "arm-linux-gnueabihf-"))))) - (replace 'build - (lambda _ - (invoke "build" "-a" "ARM" "-t" #$toolchain-ver - "-p" "ArmVirtPkg/ArmVirtQemu.dsc"))) - (delete 'build-x64) - (replace 'install - (lambda _ - (let ((fmw (string-append #$output "/share/firmware"))) - (mkdir-p fmw) - (copy-file (string-append "Build/ArmVirtQemu-ARM/RELEASE_" - #$toolchain-ver "/FV/QEMU_EFI.fd") - (string-append fmw "/ovmf_arm.bin"))))))))) - (supported-systems %supported-systems)))) - (define-public ovmf-riscv64 (let ((toolchain-ver "GCC5")) (package From patchwork Mon May 13 08:21:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 64392 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 0E85927BBE2; Mon, 13 May 2024 09:26:06 +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 EC0AF27BBE9 for ; Mon, 13 May 2024 09:26:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6Qzo-0003VW-44; Mon, 13 May 2024 04:25:20 -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 1s6QzZ-0003Th-R6 for guix-patches@gnu.org; Mon, 13 May 2024 04:25:07 -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-0001Mf-VZ for guix-patches@gnu.org; Mon, 13 May 2024 04:25:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s6QzX-0001Vp-5c; Mon, 13 May 2024 04:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70913] [PATCH 07/11] gnu: ovmf-riscv64: Update to 202402. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, 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 , Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 70913-submit@debbugs.gnu.org id=B70913.17155886545732 (code B ref 70913); Mon, 13 May 2024 08:25:03 +0000 Received: (at 70913) by debbugs.gnu.org; 13 May 2024 08:24:14 +0000 Received: from localhost ([127.0.0.1]:59433 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6Qyg-0001UI-Tt for submit@debbugs.gnu.org; Mon, 13 May 2024 04:24:14 -0400 Received: from mail-lj1-f173.google.com ([209.85.208.173]:50527) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6QyU-0001Rw-Ld for 70913@debbugs.gnu.org; Mon, 13 May 2024 04:24:01 -0400 Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-2e271acb015so52160771fa.1 for <70913@debbugs.gnu.org>; Mon, 13 May 2024 01:23:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715588572; x=1716193372; 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=ibVpW6VGtZbzZ9Ne8dZEEgNKafGS5MgjK3iPEmIN0S8=; b=Ps2vkDAsjCdO53gx9I62Zve+EtfbDR2O90nPTSoiin6IAbG7tyh05tQVrZemqzt+mF UqqMk3AB0iDBzuUba85oY4qrRkuwU3gCzM/m8uCsNY7oSS+a6R4UAISWktvOYjRafZyX yGG8dHZwADQKoFBYaMjAnp2tbDfQ4oarakJCpYLY3b7q536FWqRYr5Rv7skp0mB/GSL5 NJDjd9vwq1ghtMbfwhAwjbAwmupBZH7l1b1Go1sFa8OZozNjg/SICTnt0orAJDdT4S5M Z9pzBzoD6GJ8MF2YrloSu2EDxpHZDDYz5BYqRAgELBIoWDNSg/74nyqtOpKHLLcA19Pj 6axg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715588572; x=1716193372; 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=ibVpW6VGtZbzZ9Ne8dZEEgNKafGS5MgjK3iPEmIN0S8=; b=VrF8IDfhEVBeqG2ovGgv4lrWHfuuM+2JnWSrX7tasF97tINjOwzFv1XvxnKiYOdo9H IvcOEq3lD8Gq343lr5idfA0LM32ANyEnV8TdWJnrTyMQtqYacYjaGz0dyEKG5GzficB3 G48P0RG/vhEgImojV6z/agNnG8ROYxrfKpAc8X6nOaUa3pHn7qs6c6VzX0btuOhhplK4 Z84sxipi9sCU1Z6dxCVzVAZ0IU/7gqzTvH9qhAjfCzjgo6r7b+RD9Zjl/uCvNXBFuPXx DN7KxiQiVM+HT6u8LcizgHpF1dBAMuYE2tof3h5Txj8HHPJ/4Qd2eg9WiG2lfWjt28Rb u0wQ== X-Gm-Message-State: AOJu0Yxq9LqgaeOaeVqJl1sylVxy+13UkEwRW5I1qgai42SjK9ieblQn ZNSNYsXPnz3oyGOuniZpO6Dk7XnyW3XcP3W9OJiBzF0sxyFhojfv6GPrnsCw X-Google-Smtp-Source: AGHT+IGCKn3u1uHq5qxvY4tvYLH0IRyp7h1DE9X0GIK9Oqv8MWOH3LhknpNtA7ZGli912qcMSsO1EQ== X-Received: by 2002:a2e:a683:0:b0:2d4:2b05:a671 with SMTP id 38308e7fff4ca-2e52038a94cmr49390861fa.32.1715588572081; Mon, 13 May 2024 01:22:52 -0700 (PDT) Received: from localhost ([37.46.46.122]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-41fccee9335sm148014005e9.29.2024.05.13.01.22.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 01:22:51 -0700 (PDT) From: Efraim Flashner Date: Mon, 13 May 2024 11:21:56 +0300 Message-ID: <899f250b0d2b215959f359be6ba238f36b33ad1b.1715588342.git.efraim@flashner.co.il> 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 (ovmf-riscv64): Update to 202402. Build using make-ovmf-firmware. Change-Id: I1a7dcaac3975669a61723b929162ad33affa1619 --- gnu/packages/firmware.scm | 54 ++++++++++++--------------------------- 1 file changed, 16 insertions(+), 38 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index f660c21712..b0638382cb 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1057,6 +1057,22 @@ (define-public ovmf-arm "RELEASE_GCC/FV/QEMU_EFI.fd") (string-append fmw "/ovmf_arm.bin")))))))))))) +(define-public ovmf-riscv64 + (let ((base (make-ovmf-firmware "riscv64"))) + (package + (inherit base) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'install + (lambda _ + (let ((fmw (string-append #$output "/share/firmware"))) + (mkdir-p fmw) + (with-directory-excursion "Build/RiscVVirtQemu/RELEASE_GCC/FV" + (install-file "RISCV_VIRT_CODE.fd" fmw) + (install-file "RISCV_VIRT_VARS.fd" fmw)))))))))))) + (define-public ovmf (let ((toolchain-ver "GCC5")) (package @@ -1157,44 +1173,6 @@ (define-public ovmf (license (list license:expat license:bsd-2 license:bsd-3 license:bsd-4))))) -(define-public ovmf-riscv64 - (let ((toolchain-ver "GCC5")) - (package - (inherit ovmf) - (name "ovmf-riscv64") - (native-inputs - (append (package-native-inputs ovmf) - (if (not (string-prefix? "riscv64" (%current-system))) - `(("cross-gcc" ,(cross-gcc "riscv64-linux-gnu")) - ("cross-binutils" ,(cross-binutils "riscv64-linux-gnu"))) - '()))) - (arguments - (substitute-keyword-arguments (package-arguments ovmf) - ((#:phases phases) - #~(modify-phases #$phases - #$@(if (string-prefix? "riscv64" (%current-system)) - '() - #~((add-before 'configure 'set-env - (lambda _ - (setenv (string-append #$toolchain-ver "_RISCV64_PREFIX") - "riscv64-linux-gnu-"))))) - (replace 'build - (lambda _ - (invoke "build" "-a" "RISCV64" "-t" #$toolchain-ver - "-p" "OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc"))) - (delete 'build-x64) - (replace 'install - (lambda _ - (let ((fmw (string-append #$output "/share/firmware"))) - (mkdir-p fmw) - (copy-file (string-append "Build/RiscVVirtQemu/RELEASE_" - #$toolchain-ver "/FV/RISCV_VIRT_CODE.fd") - (string-append fmw "/RISCV_VIRT_CODE.fd")) - (copy-file (string-append "Build/RiscVVirtQemu/RELEASE_" - #$toolchain-ver "/FV/RISCV_VIRT_VARS.fd") - (string-append fmw "/RISCV_VIRT_VARS.fd"))))))))) - (supported-systems %supported-systems)))) - (define* (make-arm-trusted-firmware platform #:key (triplet "aarch64-linux-gnu")) (let ((native-build? (lambda () 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 From patchwork Mon May 13 08:21:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 64389 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 DA03027BBEA; Mon, 13 May 2024 09:26:01 +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 7131927BBE2 for ; Mon, 13 May 2024 09:26:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6Qzj-0003VN-QQ; 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-0003T9-0C 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-0001KG-NX for guix-patches@gnu.org; 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 1s6QzY-0001W9-1c for guix-patches@gnu.org; Mon, 13 May 2024 04:25:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70913] [PATCH 09/11] tests: install: Add support for aarch64 UEFI tests. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 May 2024 08:25:04 +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 Received: via spool by 70913-submit@debbugs.gnu.org id=B70913.17155886605748 (code B ref 70913); Mon, 13 May 2024 08:25:04 +0000 Received: (at 70913) by debbugs.gnu.org; 13 May 2024 08:24:20 +0000 Received: from localhost ([127.0.0.1]:59438 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6Qyn-0001UW-FT for submit@debbugs.gnu.org; Mon, 13 May 2024 04:24:20 -0400 Received: from mail-lj1-f173.google.com ([209.85.208.173]:53673) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6QyY-0001SC-0e for 70913@debbugs.gnu.org; Mon, 13 May 2024 04:24:04 -0400 Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-2e6792ea67dso21595961fa.3 for <70913@debbugs.gnu.org>; Mon, 13 May 2024 01:24:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715588576; x=1716193376; 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=R9YG45dnMqv0Gt3DfsAIgYGRoss4KkaVUlZ0QznmLxA=; b=hXa/oRx31DF48K80a/By5uokn0JahKYo9Q7bPoVACU6+bgyDCxt2DlJggzIx6KbqGb dsTPtzBwFa4oM9hjGmrFSgVXkY7aK7Mkh+aWMaMRKQGnZ0dN0QXpB+FnZSc2EZ24RteO D+6mXiNvHPP449uhMoE/SycowfNFTByVo9rwk3BSjfHTgs7Ird9sPmt3fhwH7eQf9z6P oIqlUd0YcPazzFOGNFGra48jC30cjmvliUAt+NtRhSNlFE8IalppsEtO9u9v/lLBO53A xfRWg5njo8QcJFkXSmoGJGzfRmCbNDB1Pp8+Cr0YdI5/ydVst3h103jnQ/bxu4mEKO3t GSaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715588576; x=1716193376; 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=R9YG45dnMqv0Gt3DfsAIgYGRoss4KkaVUlZ0QznmLxA=; b=lnLP5A+crRR8mHPxYcvnqrtE0C4OFxn69y0moIrS5hnuBejR2WCBodpiXroA2sCgUS nyeJZ13CCQ75hW5kCY8MUjiooC0xqz15eTi4P/PhHVFfg+ryS0Dhhiq/LXxywAF852zu 2IUWqo43czCDski37OS3J+ps4V299nlEMfFQlWoYb3X6dcsXPie0hLJoVN29UVbl2G4S 3HXlHo6+xPXwlHDVVdlQrKqdfJIOsbljJEpXi9tu1gZW+tgeBm3egLgdVSa2BDK+M7d2 BFJEI4DiCPOQjWy5b684WaF2Zy2JxPLRwwC+p3FCGMKmIFrJri75ybN+Ly+MxdkxgZmR dm+A== X-Gm-Message-State: AOJu0YxR4PnSR3kmze25mxVl23I7I/JkjOPVQyJbXJHe/3y6y57XHMyu odKrCajeV8rGuRxG/h9mDwJSqC+KyVSElVhl8JgvJNFE5AwUKHTKHi5UwdMI X-Google-Smtp-Source: AGHT+IGPor5hwHzphoyX+i0w5GoTKP3y1eZfmUYOjKVYy0JOh3zaAe/xK+Sd5aXzcg5JC+mM/J4thA== X-Received: by 2002:a2e:b385:0:b0:2e1:9c57:195a with SMTP id 38308e7fff4ca-2e52028921amr75017841fa.32.1715588575762; Mon, 13 May 2024 01:22:55 -0700 (PDT) Received: from localhost ([37.46.46.122]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-41fccbe8e3csm150255205e9.1.2024.05.13.01.22.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 01:22:55 -0700 (PDT) From: Efraim Flashner Date: Mon, 13 May 2024 11:21:58 +0300 Message-ID: <3b23c3994ff90a2adda71f564269926093e889cb.1715588342.git.efraim@flashner.co.il> 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/tests/install.scm (uefi-firmware): Add case for aarch64. Change-Id: I77a506f792790954a289eda5a7a395a2b37c19c7 --- gnu/tests/install.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 6248faed9b..90e1ca6e75 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -213,6 +213,8 @@ (define (uefi-firmware system) (file-append ovmf-x86-64 "/share/firmware/ovmf_x64.bin")) ((string-prefix? "i686" system) (file-append ovmf-i686 "/share/firmware/ovmf_ia32.bin")) + ((string-prefix? "aarch64" system) + (file-append ovmf-aarch64 "/share/firmware/ovmf_aarch64.bin")) (else #f))) (define* (run-install target-os target-os-source From patchwork Mon May 13 08:21:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 64386 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 040D127BBE9; Mon, 13 May 2024 09:25:29 +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,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 5070127BBE2 for ; Mon, 13 May 2024 09:25:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6Qzp-0003Wy-Hg; Mon, 13 May 2024 04:25:21 -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 1s6QzZ-0003Tg-Qt for guix-patches@gnu.org; Mon, 13 May 2024 04:25:07 -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 1s6QzY-0001S5-I3 for guix-patches@gnu.org; Mon, 13 May 2024 04:25:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s6QzY-0001WP-R4; Mon, 13 May 2024 04:25:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70913] [PATCH 10/11] gnu: ovmf: Deprecate in favor of ovmf-x86-64. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Mon, 13 May 2024 08:25:04 +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 , Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 70913-submit@debbugs.gnu.org id=B70913.17155886645762 (code B ref 70913); Mon, 13 May 2024 08:25:04 +0000 Received: (at 70913) by debbugs.gnu.org; 13 May 2024 08:24:24 +0000 Received: from localhost ([127.0.0.1]:59442 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6Qys-0001Um-66 for submit@debbugs.gnu.org; Mon, 13 May 2024 04:24:24 -0400 Received: from mail-wm1-f41.google.com ([209.85.128.41]:49281) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6Qya-0001SP-32 for 70913@debbugs.gnu.org; Mon, 13 May 2024 04:24:06 -0400 Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-4200ee47de7so11558615e9.2 for <70913@debbugs.gnu.org>; Mon, 13 May 2024 01:24:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715588578; x=1716193378; 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=wdI2kdsfxTtBhYk50hSn6HR44YFnElecTJ3IyG+eDdE=; b=MUeImHVf/EL+AeV/BX4sk1GtMYilut4bvgJIa8e7qV1mAIzjvALgyD4Gaouu6TsX2W nbqzcgl9DRx6S7lx0LQsfXIbg0KONmgILo5nQFP9SO8iGbDOY0iWCsUJ2AXruMx2k/HL nac4R0DfxrKM43/uVHh1vHmCq59EAYZ/fHXtAOjuxZnOmPgB16ou0AAgDdrPDXmZ05wt 3MDKiptDODM/WbUvyNbAEHzkyqeYgby+x8FqxGcWyG+FjfeMrOTlCj1CEeHyf/Kr9Hrq XxBA6O0zrNEFMAnc33n0/MoZ8pUdSvL6i/zVDC4XRe80l6HXKZrEX/HqYjRvBAL1hkjl PNuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715588578; x=1716193378; 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=wdI2kdsfxTtBhYk50hSn6HR44YFnElecTJ3IyG+eDdE=; b=oKwf0mhMhvbo7YU3pfUzl3md5RXlkKc03MznBcD5RKd7qtcG3krzz2k7fErOCcWrAt W3DbXrERnOECSSN7oGIafIUhf4oTOqvhjNYKLtMiZLNz7WpMtWitj/XmGNCX/Dm07ptX ssCeNNBhpmw+WEtRyHho+gS3j3rMJF4z59KwrP+5lnHZI2AKPojLdCESmOidKzZF/zew siVFQtlQzOHkVeXbrbpvSTexDojKn2VTplD83BrSQE/nOFeyYa1dzkqVs5s7VKKlu0fy c0GlkA8Tb//Ib1TudE6XK6rKJT3m3dL91gt6qAHL0pknhFp4tpZkwoBdBgL2fSNlKJCy PK0Q== X-Gm-Message-State: AOJu0YxULdZoTFmoQzAvXZ49YJ7I5fQaHPlgsBD2ZmSXoZX475FyxrBn H3u0ahGSONoNg4z7KMvyYgA6ZAAfWptlQetEj3gX27/EjKbjEGaWhJnmt0q5 X-Google-Smtp-Source: AGHT+IF8vXm1lfBp3e5tGKt4Wa9lS8bNDNzrBBY78rdgbUmarzhLmzBA0oPNNm4kXTXZlHIJgaem7A== X-Received: by 2002:a05:600c:5605:b0:41c:7ac7:17f5 with SMTP id 5b1f17b1804b1-41feab42b76mr64773065e9.24.1715588577661; Mon, 13 May 2024 01:22:57 -0700 (PDT) Received: from localhost ([37.46.46.122]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42011d91edfsm55232045e9.44.2024.05.13.01.22.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 01:22:57 -0700 (PDT) From: Efraim Flashner Date: Mon, 13 May 2024 11:21:59 +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 * gnu/packages/firmware.scm (ovmf): Deprecate package in favor of ovmf-x86-64. Change-Id: I912c2b122f80a7f3fd473b8d91ae6e714b27808f --- gnu/packages/firmware.scm | 100 +------------------------------------- 1 file changed, 2 insertions(+), 98 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index b0638382cb..55f78c3da6 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -30,6 +30,7 @@ (define-module (gnu packages firmware) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix memoization) + #:use-module (guix deprecation) #:use-module (guix packages) #:use-module (guix platform) #:use-module (guix download) @@ -1074,104 +1075,7 @@ (define-public ovmf-riscv64 (install-file "RISCV_VIRT_VARS.fd" fmw)))))))))))) (define-public ovmf - (let ((toolchain-ver "GCC5")) - (package - (name "ovmf") - (version "202311") - (source (origin - (method git-fetch) - (uri (git-reference - ;; OVMF is part of the edk2 source tree. - (url "https://github.com/tianocore/edk2") - (recursive? #t) ;edk2 now uses a lot of submodules - (commit (string-append "edk2-stable" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "136dl5cxpjpg37whzlqq7jrrjsgybmwrgkbbmks8xaixqmzwhbw0")))) - (build-system gnu-build-system) - (arguments - (list - #:tests? #f ; No check target. - #:target #f ; Package produces firmware. - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda _ - (substitute* "edksetup.sh" - (("^return \\$\\?") - "exit $?")))) - (replace 'configure - (lambda _ - (let* ((cwd (getcwd)) - (tools (string-append cwd "/BaseTools")) - (bin (string-append tools "/BinWrappers/PosixLike"))) - (setenv "WORKSPACE" cwd) - (setenv "EDK_TOOLS_PATH" tools) - (setenv "PYTHON3_ENABLE" "TRUE") - (setenv "PYTHON_COMMAND" "python3") - (setenv "PATH" (string-append (getenv "PATH") ":" bin)) - (invoke "bash" "edksetup.sh") - (substitute* "Conf/tools_def.txt" - ;; Guix gcc is compiled without pie - ;; The -no-pie flag causes the Ia32 build to fail - (("-no-pie") "")) - (substitute* "Conf/target.txt" - (("^TARGET[ ]*=.*$") "TARGET = RELEASE\n") - (("^TOOL_CHAIN_TAG[ ]*=.*$") - (string-append "TOOL_CHAIN_TAG = " #$toolchain-ver "\n")) - (("^TARGET_ARCH[ ]*=.*$") - (string-append "TARGET_ARCH = IA32" - #$@(if (string=? "x86_64-linux" (%current-system)) - '(", X64") - '()) - "\n")) - (("^MAX_CONCURRENT_THREAD_NUMBER[ ]*=.*$") - (format #f "MAX_CONCURRENT_THREAD_NUMBER = ~a~%" - (number->string (parallel-job-count))))) - ;; Build build support. - (setenv "CC" "gcc") - (invoke "make" "-C" tools)))) - (replace 'build - (lambda _ - (invoke "build" "-a" "IA32" "-t" #$toolchain-ver - "-p" "OvmfPkg/OvmfPkgIa32.dsc"))) - #$@(if (string=? "x86_64-linux" (%current-system)) - #~((add-after 'build 'build-x64 - (lambda _ - (invoke "build" "-a" "X64" "-t" #$toolchain-ver - "-p" "OvmfPkg/OvmfPkgX64.dsc")))) - #~()) - (replace 'install - (lambda _ - (let ((fmw (string-append #$output "/share/firmware"))) - (mkdir-p fmw) - (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) - ("nasm" ,nasm) - ("perl" ,perl) - ("python-3" ,python-3) - ("util-linux" ,util-linux "lib"))) - (supported-systems '("x86_64-linux" "i686-linux")) - (home-page "https://www.tianocore.org") - (synopsis "UEFI firmware for QEMU") - (description "OVMF is an EDK II based project to enable UEFI support for -Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.") - (license (list license:expat - license:bsd-2 license:bsd-3 license:bsd-4))))) + (deprecated-package "ovmf" ovmf-x86-64)) (define* (make-arm-trusted-firmware platform #:key (triplet "aarch64-linux-gnu")) From patchwork Mon May 13 08:22:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 64384 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 5266727BBE9; Mon, 13 May 2024 09:25:22 +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=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 5986427BBE2 for ; Mon, 13 May 2024 09:25:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6Qzk-0003VP-3M; Mon, 13 May 2024 04:25:20 -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 1s6QzZ-0003Tj-RT for guix-patches@gnu.org; Mon, 13 May 2024 04:25:07 -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 1s6QzY-0001UW-W8 for guix-patches@gnu.org; Mon, 13 May 2024 04:25:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s6QzZ-0001WX-A7 for guix-patches@gnu.org; Mon, 13 May 2024 04:25:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70913] [PATCH 11/11] tests: install: Use a default qemu machine for arm architectures. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 May 2024 08:25:05 +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 Received: via spool by 70913-submit@debbugs.gnu.org id=B70913.17155886795770 (code B ref 70913); Mon, 13 May 2024 08:25:05 +0000 Received: (at 70913) by debbugs.gnu.org; 13 May 2024 08:24:39 +0000 Received: from localhost ([127.0.0.1]:59444 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6Qyu-0001Ut-8a for submit@debbugs.gnu.org; Mon, 13 May 2024 04:24:39 -0400 Received: from mail-wr1-f49.google.com ([209.85.221.49]:42193) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6Qyb-0001SV-MZ for 70913@debbugs.gnu.org; Mon, 13 May 2024 04:24:08 -0400 Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-34d7b0dac54so2228098f8f.0 for <70913@debbugs.gnu.org>; Mon, 13 May 2024 01:24:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715588579; x=1716193379; 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=TqxFDHaA5joWfgfcfaw4+JVzhrp30766OLk8EqVje04=; b=NYkcrvZZ0lDK/tH1Ph1sh2I4lXTLtfC2j4RKz/qILwVgDNhbUyaMcFtM1h6gLjVEUq eu95kdMdrc08t5bCadmu+gu5LHhyGQooXZCUMeVUFW7QxTfA5y9bS90Z+BIOmQ0ecQ+v kXZ5FAi4n+Ao1BRREdDmIM4jhnfH8gmyqqVHW7NHvD42t1q8QHzvBQ7UTubDZeVO9ejY UnS/Blj5usv4rv04k5hOOOExqlnlsi6NR1Sn5V0HCle1knDQnOwkuj6Q1jC0LUsDvFJY Qs5a3Dt813qn+p9TNdfYJICgV34q48CP4a7YPhaS1Iifjv+Q6HUSwMLTd6PKrNqijAVO pB3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715588579; x=1716193379; 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=TqxFDHaA5joWfgfcfaw4+JVzhrp30766OLk8EqVje04=; b=xGbiAeAsx4KBiAPQmih0FLph9JocDMCeCQAA+hP/mV2GNhvOZC4bBN6YyRtPxnQwBJ 6WUiMESaKk07yebmLpUJzAq/IkpkuwNLWY1fSYmI8yNC3x9IMGKN4ZfebDkQJegt1nkF 5LLY+vcYpFErFTv/XUlt2U6w3XPe3KSAvFBV/n7WuEWHYM5GSBHzypHAva9AUoXAQT6V DC0U/3L6CmjP+O8w93PyM25hHH8whHpc2QJHrD72cPnM5oLHvwVILnL96LVC7Mx34c50 Q+ZPJSUKVxywSETuiGUqEi1YSJ7n32iq8iaLSd81+G2IL1lfprNM3nwmPscy0ckPTprH 1OFg== X-Gm-Message-State: AOJu0YxKcrubxcWLtPSQrLsCfnFFpa8rcG7MXvJ+/loMI/4J3M+/m96U 6nxYJy/IIDUhGlcvheezBNSLHsH4H7SoYqkVFbkxgKcdt0QnzUDbPRS7BWhP X-Google-Smtp-Source: AGHT+IHOcydUGaKOe3+QWzRgdQTyONG6Nfzj2+I5+QADLytngRyzkBUBJfDXvmGWKOIWkZCjvVkzfA== X-Received: by 2002:adf:cc08:0:b0:343:cee1:cbc1 with SMTP id ffacd0b85a97d-350181150b2mr10545875f8f.14.1715588579480; Mon, 13 May 2024 01:22:59 -0700 (PDT) Received: from localhost ([37.46.46.122]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3502baad04dsm10501167f8f.81.2024.05.13.01.22.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 01:22:59 -0700 (PDT) From: Efraim Flashner Date: Mon, 13 May 2024 11:22:00 +0300 Message-ID: <86a554995ba7ef5847407df4f034df06c8b35041.1715588342.git.efraim@flashner.co.il> 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/tests/install.scm (qemu-command*): Adjust qemu command when run on armhf-linux or aarch64-linux to include a machine type. (run-install): Same. Change-Id: I32f85183cd8ec39c6a2e66624954743fd5983582 --- gnu/tests/install.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 90e1ca6e75..36dbd9111f 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -289,6 +289,12 @@ (define* (run-install target-os target-os-source (define marionette (make-marionette `(,(which #$(qemu-command system)) + ;; Neither of these architectures have a default machine. + ,@(if (or (string=? "aarch64-linux" #$system) + (string=? "armhf-linux" #$system)) + '("-machine" "virt" + "-cpu" "host") + '()) "-no-reboot" "-m" "1200" ,@(if #$uefi-firmware @@ -363,6 +369,12 @@ (define* (qemu-command* images #:key (uefi-support? #f) (memory-size 256)) (use-modules (srfi srfi-1)) `(,(string-append #$qemu-minimal "/bin/" #$(qemu-command system)) + ;; Neither of these architectures have a default machine. + ,@(if (or (string=? "aarch64-linux" #$system) + (string=? "armhf-linux" #$system)) + '("-machine" "virt" + "-cpu" "host") + '()) "-snapshot" ;for the volatile, writable overlay ,@(if (file-exists? "/dev/kvm") '("-enable-kvm")