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