From: Efraim Flashner <efraim@flashner.co.il>
To: 70913@debbugs.gnu.org
Cc: Efraim Flashner <efraim@flashner.co.il>,
Efraim Flashner <efraim@flashner.co.il>,
Vagrant Cascadian <vagrant@debian.org>
Subject: [bug#70913] [PATCH 06/11] gnu: ovmf-arm: Update to 202402.
Date: Mon, 13 May 2024 11:21:55 +0300 [thread overview]
Message-ID: <2a36840df037dc831a74879954f9d7407a57fc0a.1715588342.git.efraim@flashner.co.il> (raw)
In-Reply-To: <cover.1715588342.git.efraim@flashner.co.il>
* 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
--
Efraim Flashner <efraim@flashner.co.il> רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
next prev parent reply other threads:[~2024-05-13 8:25 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-13 8:19 [bug#70913] [PATCH 00/11] Combine edk2-tools and ovmf firmware Efraim Flashner
2024-05-13 8:21 ` [bug#70913] [PATCH 01/11] gnu: edk2-tools: Update to 202402 Efraim Flashner
2024-05-13 8:21 ` [bug#70913] [PATCH 02/11] gnu: edk2-tools: Enable submodules Efraim Flashner
2024-05-13 8:21 ` [bug#70913] [PATCH 03/11] gnu: Add ovmf-x86-64 Efraim Flashner
2024-05-13 8:21 ` [bug#70913] [PATCH 04/11] gnu: Add ovmf-i686 Efraim Flashner
2024-05-13 8:21 ` [bug#70913] [PATCH 05/11] gnu: ovmf-aarch64: Update to 202402 Efraim Flashner
2024-05-13 8:21 ` Efraim Flashner [this message]
2024-05-13 8:21 ` [bug#70913] [PATCH 07/11] gnu: ovmf-riscv64: " Efraim Flashner
2024-05-13 8:21 ` [bug#70913] [PATCH 08/11] gnu: Use new ovmf firmware packages Efraim Flashner
2024-05-13 8:21 ` [bug#70913] [PATCH 09/11] tests: install: Add support for aarch64 UEFI tests Efraim Flashner
2024-05-13 8:21 ` [bug#70913] [PATCH 10/11] gnu: ovmf: Deprecate in favor of ovmf-x86-64 Efraim Flashner
2024-05-13 8:22 ` [bug#70913] [PATCH 11/11] tests: install: Use a default qemu machine for arm architectures Efraim Flashner
[not found] ` <handler.70913.B.17155884115327.ack@debbugs.gnu.org>
2024-05-27 8:44 ` bug#70913: Acknowledgement ([PATCH 00/11] Combine edk2-tools and ovmf firmware) Efraim Flashner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2a36840df037dc831a74879954f9d7407a57fc0a.1715588342.git.efraim@flashner.co.il \
--to=efraim@flashner.co.il \
--cc=70913@debbugs.gnu.org \
--cc=vagrant@debian.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.