From patchwork Sun Nov 12 03:07:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: spacecadet X-Patchwork-Id: 56363 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 0995727BBEA; Sun, 12 Nov 2023 03:08:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,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 6BFD527BBE2 for ; Sun, 12 Nov 2023 03:08:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r20pj-00048s-SB; Sat, 11 Nov 2023 22:08:23 -0500 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 1r20ph-00048V-Pc for guix-patches@gnu.org; Sat, 11 Nov 2023 22:08:21 -0500 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 1r20ph-0002u9-Hf for guix-patches@gnu.org; Sat, 11 Nov 2023 22:08:21 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r20qM-0000IX-5n for guix-patches@gnu.org; Sat, 11 Nov 2023 22:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67119] [PATCH 4/4] gnu: ovmf: Update ovmf-arm with GCC5. References: In-Reply-To: Resent-From: spacecadet@purge.sh Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Nov 2023 03:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67119 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67119@debbugs.gnu.org Received: via spool by 67119-submit@debbugs.gnu.org id=B67119.16997585041099 (code B ref 67119); Sun, 12 Nov 2023 03:09:02 +0000 Received: (at 67119) by debbugs.gnu.org; 12 Nov 2023 03:08:24 +0000 Received: from localhost ([127.0.0.1]:54732 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r20pk-0000Hf-3N for submit@debbugs.gnu.org; Sat, 11 Nov 2023 22:08:24 -0500 Received: from relay1-d.mail.gandi.net ([217.70.183.193]:57627) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r20pi-0000HS-Ek for 67119@debbugs.gnu.org; Sat, 11 Nov 2023 22:08:23 -0500 Received: by mail.gandi.net (Postfix) with ESMTPA id 93AFE240003 for <67119@debbugs.gnu.org>; Sun, 12 Nov 2023 03:07:35 +0000 (UTC) MIME-Version: 1.0 Date: Sun, 12 Nov 2023 03:07:35 +0000 From: spacecadet@purge.sh Message-ID: X-Sender: spacecadet@purge.sh X-GND-Sasl: spacecadet@purge.sh 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 Updating OVMF to 202308 requires GCC5, packages inheriting from ovmf also need to be updated. --- gnu/packages/firmware.scm | 61 ++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 30 deletions(-) + (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* (make-arm-trusted-firmware platform #:key (triplet "aarch64-linux-gnu")) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index e713aa9ac6..0ee618cbcb 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1014,36 +1014,37 @@ (define-public ovmf-aarch64 (supported-systems %supported-systems)))) (define-public ovmf-arm - (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 "GCC49_ARM_PREFIX" "arm-linux-gnueabihf-"))))) - (replace 'build - (lambda _ - (invoke "build" "-a" "ARM" "-t" "GCC49" - "-p" "ArmVirtPkg/ArmVirtQemu.dsc"))) - (delete 'build-x64) - (replace 'install - (lambda _ - (let ((fmw (string-append #$output "/share/firmware"))) - (mkdir-p fmw) - (copy-file "Build/ArmVirtQemu-ARM/RELEASE_GCC49/FV/QEMU_EFI.fd" - (string-append fmw "/ovmf_arm.bin"))))))))) - (supported-systems %supported-systems))) + (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")))