From patchwork Sun Nov 12 02:48:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: spacecadet X-Patchwork-Id: 56360 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 DEFA327BBEA; Sun, 12 Nov 2023 02:48:41 +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,URIBL_BLOCKED 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 9BADA27BBE2 for ; Sun, 12 Nov 2023 02:48:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r20WP-0007dt-Cq; Sat, 11 Nov 2023 21:48:25 -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 1r20WM-0007dZ-MV for guix-patches@gnu.org; Sat, 11 Nov 2023 21:48:22 -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 1r20WM-0003ak-EZ for guix-patches@gnu.org; Sat, 11 Nov 2023 21:48:22 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r20X0-0008DY-Ko for guix-patches@gnu.org; Sat, 11 Nov 2023 21:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67119] [PATCH 1/4] gnu: ovmf: Update to 202308. Resent-From: spacecadet@purge.sh Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Nov 2023 02:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67119 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67119@debbugs.gnu.org X-Debbugs-Original-To: Guix Patches Received: via spool by submit@debbugs.gnu.org id=B.169975734131572 (code B ref -1); Sun, 12 Nov 2023 02:49:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Nov 2023 02:49:01 +0000 Received: from localhost ([127.0.0.1]:54703 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r20Wy-0008D8-J8 for submit@debbugs.gnu.org; Sat, 11 Nov 2023 21:49:01 -0500 Received: from lists.gnu.org ([2001:470:142::17]:45152) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r20Ww-0008CH-Fy for submit@debbugs.gnu.org; Sat, 11 Nov 2023 21:48:59 -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 1r20WB-0007d6-TZ for guix-patches@gnu.org; Sat, 11 Nov 2023 21:48:11 -0500 Received: from relay2-d.mail.gandi.net ([217.70.183.194]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r20W9-0003Zs-Sq for guix-patches@gnu.org; Sat, 11 Nov 2023 21:48:11 -0500 Received: by mail.gandi.net (Postfix) with ESMTPA id 8B5E340003 for ; Sun, 12 Nov 2023 02:48:05 +0000 (UTC) MIME-Version: 1.0 Date: Sun, 12 Nov 2023 02:48:05 +0000 From: spacecadet@purge.sh Message-ID: X-Sender: spacecadet@purge.sh X-GND-Sasl: spacecadet@purge.sh Received-SPF: pass client-ip=217.70.183.194; envelope-from=spacecadet@purge.sh; helo=relay2-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 Update package to 202308 and add toolchain-ver variable for the GCC version being use in the build. --- gnu/packages/firmware.scm | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) (build-system gnu-build-system) (arguments (list @@ -916,41 +916,56 @@ (define-public ovmf (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 "BUILD_CC" "gcc") + (setenv "CC" "gcc") (invoke "make" "-C" tools)))) (replace 'build (lambda _ - (invoke "build" "-a" "IA32" "-t" "GCC49" + (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" "GCC49" + (invoke "build" "-a" "X64" "-t" #$toolchain-ver "-p" "OvmfPkg/OvmfPkgX64.dsc")))) #~()) (replace 'install (lambda _ - (let ((fmw (string-append #$output "/share/firmware"))) + (let ((fmw (string-append #$output "/share/firmware")) + (toolchain-ver #$toolchain-ver)) (mkdir-p fmw) - (copy-file "Build/OvmfIa32/RELEASE_GCC49/FV/OVMF.fd" + (copy-file (string-append "Build/OvmfIa32/RELEASE_" toolchain-ver "/FV/OVMF.fd") (string-append fmw "/ovmf_ia32.bin")) #$@(if (string=? "x86_64-linux" (%current-system)) - '((copy-file "Build/OvmfX64/RELEASE_GCC49/FV/OVMF.fd" + '((copy-file (string-append "Build/OvmfX64/RELEASE_" toolchain-ver "/FV/OVMF.fd") (string-append fmw "/ovmf_x64.bin"))) '()))))))) (native-inputs `(("acpica" ,acpica) ("gcc@5" ,gcc-5) ("nasm" ,nasm) - ("python-2" ,python-2) + ("perl" ,perl) + ("python-3" ,python-3) ("util-linux" ,util-linux "lib"))) (supported-systems '("x86_64-linux" "i686-linux")) (home-page "https://www.tianocore.org") base-commit: af6105afc67a15a491a0a4fd18a28c9f801a0b94 diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 294bbea184..fd8b6bb8f0 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -872,21 +872,21 @@ (define-public edk2-tools (license license:bsd-2))) (define-public ovmf - (let ((commit "13a50a6fe1dcfa6600c38456ee24e0f9ecf51b5f") - (revision "1")) + (let ((toolchain-ver "GCC5")) (package (name "ovmf") - (version (git-version "20170116" revision commit)) + (version "202308") (source (origin (method git-fetch) (uri (git-reference ;; OVMF is part of the edk2 source tree. (url "https://github.com/tianocore/edk2") - (commit commit))) + (recursive? #t) ;edk2 now uses a lot of submodules + (commit (string-append "edk2-stable" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "1gy2332kdqk8bjzpcsripx10896rbvgl0ic7r344kmpiwdgm948b")))) + "04rnfnaqr2c7ayplj7ib730zp1snw157zx5rmykz5hz1zz2vb20j")))) From patchwork Sun Nov 12 03:02:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: spacecadet X-Patchwork-Id: 56361 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 601B227BBE9; Sun, 12 Nov 2023 03:03:43 +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=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 C99BE27BBE2 for ; Sun, 12 Nov 2023 03:03:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r20kt-00038B-W9; Sat, 11 Nov 2023 22:03:24 -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 1r20ks-00037z-0Z for guix-patches@gnu.org; Sat, 11 Nov 2023 22:03:22 -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 1r20kr-0002Hc-On for guix-patches@gnu.org; Sat, 11 Nov 2023 22:03:21 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r20lW-0000B1-Cu for guix-patches@gnu.org; Sat, 11 Nov 2023 22:04:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67119] [PATCH 2/4] gnu: ovmf: Add OVMF_CODE and OVMF_VARS files. 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:04: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.1699758187610 (code B ref 67119); Sun, 12 Nov 2023 03:04:02 +0000 Received: (at 67119) by debbugs.gnu.org; 12 Nov 2023 03:03:07 +0000 Received: from localhost ([127.0.0.1]:54724 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r20kc-00009m-Ui for submit@debbugs.gnu.org; Sat, 11 Nov 2023 22:03:07 -0500 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:58719) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r20ka-00009H-S1 for 67119@debbugs.gnu.org; Sat, 11 Nov 2023 22:03:05 -0500 Received: by mail.gandi.net (Postfix) with ESMTPA id C7D881C0003 for <67119@debbugs.gnu.org>; Sun, 12 Nov 2023 03:02:17 +0000 (UTC) MIME-Version: 1.0 Date: Sun, 12 Nov 2023 03:02:17 +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 Add OVMF_CODE.fd and OVMF_VARS.fs to outputs as ovmf_code_arch.bin and ovmf_vars_arch.bin, respectively, for both ia32 and x64 architectures. --- gnu/packages/firmware.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (string-downcase file) "_x64.bin"))) + '())) + (list "OVMF" + "OVMF_CODE" + "OVMF_VARS")))))))) (native-inputs `(("acpica" ,acpica) ("gcc@5" ,gcc-5) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index fd8b6bb8f0..53b89e4d90 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -954,12 +954,17 @@ (define-public ovmf (let ((fmw (string-append #$output "/share/firmware")) (toolchain-ver #$toolchain-ver)) (mkdir-p fmw) - (copy-file (string-append "Build/OvmfIa32/RELEASE_" toolchain-ver "/FV/OVMF.fd") - (string-append fmw "/ovmf_ia32.bin")) - #$@(if (string=? "x86_64-linux" (%current-system)) - '((copy-file (string-append "Build/OvmfX64/RELEASE_" toolchain-ver "/FV/OVMF.fd") - (string-append fmw "/ovmf_x64.bin"))) - '()))))))) + (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 "/" From patchwork Sun Nov 12 03:06:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: spacecadet X-Patchwork-Id: 56362 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 1963927BBEA; Sun, 12 Nov 2023 03:07:38 +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 DB1DA27BBE2 for ; Sun, 12 Nov 2023 03:07:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r20ok-0003w4-6u; Sat, 11 Nov 2023 22:07:22 -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 1r20oj-0003vw-Ft for guix-patches@gnu.org; Sat, 11 Nov 2023 22:07: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 1r20oj-0002of-7r for guix-patches@gnu.org; Sat, 11 Nov 2023 22:07:21 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r20pN-0000Gu-Si for guix-patches@gnu.org; Sat, 11 Nov 2023 22:08:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67119] [PATCH 3/4] gnu: ovmf: Update ovmf-aarch64 to use 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:08:01 +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.1699758425980 (code B ref 67119); Sun, 12 Nov 2023 03:08:01 +0000 Received: (at 67119) by debbugs.gnu.org; 12 Nov 2023 03:07:05 +0000 Received: from localhost ([127.0.0.1]:54728 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r20oS-0000Fj-II for submit@debbugs.gnu.org; Sat, 11 Nov 2023 22:07:04 -0500 Received: from relay4-d.mail.gandi.net ([2001:4b98:dc4:8::224]:58441) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r20oQ-0000FC-8b for 67119@debbugs.gnu.org; Sat, 11 Nov 2023 22:07:02 -0500 Received: by mail.gandi.net (Postfix) with ESMTPA id 6DB24E0003 for <67119@debbugs.gnu.org>; Sun, 12 Nov 2023 03:06:13 +0000 (UTC) MIME-Version: 1.0 Date: Sun, 12 Nov 2023 03:06:13 +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-AARCH64/RELEASE_" #$toolchain-ver "/FV/QEMU_EFI.fd") + (string-append fmw "/ovmf_aarch64.bin"))))))))) + (supported-systems %supported-systems)))) (define-public ovmf-arm (package diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 53b89e4d90..e713aa9ac6 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -981,36 +981,37 @@ (define-public ovmf license:bsd-2 license:bsd-3 license:bsd-4))))) (define-public ovmf-aarch64 - (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 "GCC49_AARCH64_PREFIX" "aarch64-linux-gnu-"))))) - (replace 'build - (lambda _ - (invoke "build" "-a" "AARCH64" "-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-AARCH64/RELEASE_GCC49/FV/QEMU_EFI.fd" - (string-append fmw "/ovmf_aarch64.bin"))))))))) - (supported-systems %supported-systems))) + (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"))) 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")))