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: 27433 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