From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id sAXnCHZBUGXfEwAAauVa8A:P1 (envelope-from ) for ; Sun, 12 Nov 2023 04:07:34 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id sAXnCHZBUGXfEwAAauVa8A (envelope-from ) for ; Sun, 12 Nov 2023 04:07:34 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id F40745F820 for ; Sun, 12 Nov 2023 04:07:33 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1699758454; a=rsa-sha256; cv=none; b=CAEkw+1dbwqLkyvMKg1/NtGOxTieQU9ozQwJw/qjELkm3DReeW8dCSg6vnlNS2qjB9hhMt CxD9p2QuQQZ/KQAGwwQTlAonSRgBvEaLyLqnMFGZ5wTqSnj8tdP6AgkeszHSkDQLvUknDO e9nMUiUyDr1roC3pKoG1wZLr11fLW17FcalRFoRi/qV8A4f9CaiPVzqqQocf70Ft3s37lI cBNt0l++CdPUXAbY0EmJytvWKZNhlT5t2ca/gVMD4ECVvNPVTh7s3KrRv3cjbG4GlMkakF 9LnYSWQpkCnm+yEAHXtJkNm8U5eNvtrELhqGdbmGZdbngIoVShE9KnJ3H1d30g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1699758454; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=vdMwEKhd31u6BFkOMd7ZoxRUzO7/uKvYX4ENY7b0qsE=; b=B253DDk3quPXaIuzVGHiuz7PAzgiDrLmaP/4U9zI9upQBNJ5vIKdbPW7t4rkQnE+5vjD9U 8w+6hWmwPjUzzpGS2cg/5VcFELhaqh5URJdk2QYlajgs90VgAmCDLqkGDYihIUmBeow5pa B8QumLSNavMBBF2OkIe5i7D5wkH8YIxSGpuWxptUnY8SvLYNjUtNHZmvW1iI7S3SK8oe5r cSC30qwS9fxLSYyNi8/2H1rKrm0S54morbiq6OZAUG+W1j9Zw3xDwPjxUHj91wpGhqnP5a ydZXfEIMNMTE7ubdHXzQtSsKVw9SdynmC7Or1fcSkYD9tsGlfNa90Qohf1Ep2w== 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 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: F40745F820 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -6.21 X-Spam-Score: -6.21 X-TUID: m6NOpqhL8I38 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(-) 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"))) + (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 -- 2.41.0