From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id sJCEJjYoXGdUDgEAe85BDQ:P1 (envelope-from ) for ; Fri, 13 Dec 2024 12:27:34 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id sJCEJjYoXGdUDgEAe85BDQ (envelope-from ) for ; Fri, 13 Dec 2024 13:27:34 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=CtToi+QV; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=VsrYuNxc; dmarc=pass (policy=none) header.from=gnu.org; 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=1734092854; a=rsa-sha256; cv=none; b=Q+e2RaMigmvtR2EXB5DNRtQ8VadjTjPWrf+pigJ+SJyVgB0q4GM4m9XNisgllvmyzAONY/ 6zFVtH4TtdH3CIh+W02mWeTSFJkO3qcmVRVSIYKUPSGDQ3ALmyD8HkEbvF1/7CkScYB4jp zfZ50NRCgXvnjPzQ9WgCpnz3AYzANqrMAyeI17Jh4Tjg/TL+/EvAS0CO2fe/KIqVLtYi4G yuVOCOHHmeSnae6Wd2rRh5Wd5C3bXH/RvQqKvV7S5z769G62MS64g8znJVYUqbLqjyX08O W7kInUkCWFrTJ7L9TJzx4GZqugtbFiRTqRtqEQbhQLZiZPHGWbAnQg9Jif80sg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=CtToi+QV; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=VsrYuNxc; dmarc=pass (policy=none) header.from=gnu.org; 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=1734092854; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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:dkim-signature; bh=ndw/QoHraw3kuplvO7s+pF9hBzCMtWSU246hCrBZ6hM=; b=VkAtFzEmqLtkVJ41N3YlgSaDR6sFFlFQj9r3Mn5aKBI45q+JY2a+YVz6SwtnVwynCiRCQ4 vDZqoXWHHFKha25j//divUsE5Pd0S904eLoGnbqJn27f7BUTjODrATLbLTtXPT2iHan9C6 WgVNdg3xDDueLXUs2hhZJuRPVhbkOX1iIN8xJ0nR2gM3SEiRGpl5jKsGAWHMTPqCmcyVP+ efZyLLniWIdZEnNkAt9J5RDkd3ZRDMSlQe0h0BpkXQBWW2o3M3QUqaK+XVP0j7CLLiFTuj xmzkv1DBLjayfNtqHaCZFYevVegj40IOXCXPyXG5ziqXfsOHM7nCR2PFe7Cp+Q== 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 C00AC7ADB5 for ; Fri, 13 Dec 2024 13:27:33 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tM4lS-0005El-SB; Fri, 13 Dec 2024 07:27:27 -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 1tM4lK-00054X-8W for guix-patches@gnu.org; Fri, 13 Dec 2024 07:27:19 -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 1tM4l5-00053H-UF for guix-patches@gnu.org; Fri, 13 Dec 2024 07:27:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ndw/QoHraw3kuplvO7s+pF9hBzCMtWSU246hCrBZ6hM=; b=CtToi+QV1NHreod4xVfY1Nph46Z1qQZWRdOm1oIe+s3gBgt/eJqeq3ApZ7VghvuxNnx+RGwHF9CP+yYeKigtRhcgB0koMqJx+FXCnSQ6ckQeVv9F6RBMwR2bmS0HBxCa+BOe8ZiR0KiQD/M+nQHIuWtXDhk9D9G1c0RFeg70WrUVlvMCdPypMF84/gPvOy5J08NDy4G1voiGQBBPcKwg2nmWemI/lpyBo9THh2aRlP0ub2LZ3YFZwO8vx1sSLtQrZJV2caE9ZXS+AouUrRuQfwpBQV67z2BOwL8EcQpDadWGuDpgbBUncd6yeBqmqNOP8v9Ln2xTtAFIZtZo9U3Bmg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tM4l5-0003We-Mt; Fri, 13 Dec 2024 07:27:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74849] [PATCH 2/6] gnu: arm-trusted-firmware: Reformat. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Fri, 13 Dec 2024 12:27:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74849 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74849@debbugs.gnu.org Cc: Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 74849-submit@debbugs.gnu.org id=B74849.173409280213478 (code B ref 74849); Fri, 13 Dec 2024 12:27:03 +0000 Received: (at 74849) by debbugs.gnu.org; 13 Dec 2024 12:26:42 +0000 Received: from localhost ([127.0.0.1]:41933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tM4kj-0003VB-SJ for submit@debbugs.gnu.org; Fri, 13 Dec 2024 07:26:42 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:41465 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tM4kg-0003US-Kg for 74849@debbugs.gnu.org; Fri, 13 Dec 2024 07:26:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734092789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ndw/QoHraw3kuplvO7s+pF9hBzCMtWSU246hCrBZ6hM=; b=VsrYuNxcT+7jCsJN2fV9icPFfYCyENcbJjdAMSw2zv+SEa56orjGb6O1OhwEOtiTVGTWlR /VrdZih575YIrCV4EJZmqYe6FAq55I2MsPA5TNRkXtQ5tMlxJIBo3wIZcUGnp7GT8mMR1N 8QL6z5rYeemYTDUuf285iSakqKW0K9a48Epb47WaFNXRVZGDYuUxyLlgzGKzQC/6Wftxyj 28dNLn9kuvOBU67MfKb8L/PmVl3ILu4UgMiFMnU8sh450kg4nV0fiGW+REE2vSVERJ+6hB OQPEHx+o6FcAx0VOAGQMunFWIyWPDeegR71x2nIo9CY9qdwTIfzxjgsI0XMEug== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 04869376 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <74849@debbugs.gnu.org>; Fri, 13 Dec 2024 12:26:29 +0000 (UTC) Date: Fri, 13 Dec 2024 13:25:45 +0100 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches From: Herman Rimm via Guix-patches via 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: C00AC7ADB5 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -2.97 X-Spam-Score: -2.97 X-TUID: K4rKMH0uN8JX * gnu/packages/firmware.scm (arm-trusted-firmware)[source]: Use modules. [synopsis]: Mention supported architectures. [description]: Fix "ARMv7A" typo. Remove newline. Change-Id: I52d1a02f27e1c8ebbe5b48ea9a69e4c008ff5b9c --- gnu/packages/firmware.scm | 104 ++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 55 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 2750bab66d..ff083a2c6f 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1099,68 +1099,62 @@ (define-public ovmf (define* (make-arm-trusted-firmware platform #:key (triplet "aarch64-linux-gnu")) - (let ((native-build? (lambda () - ;; Note: %current-system is a *triplet*, unlike its - ;; name would suggest. - (or (not triplet) ;disable cross-compilation - (string=? (%current-system) - (gnu-triplet->nix-system triplet)))))) - (package - (name (string-append "arm-trusted-firmware-" platform)) - (version "2.9") - (source - (origin - (method git-fetch) - (uri (git-reference - ;; There are only GitHub generated release snapshots. - (url "https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/") - (commit (string-append "v" version)))) - (file-name (git-file-name "arm-trusted-firmware" version)) - (sha256 - (base32 - "16fjbn1zck0d8b554h8lk1svqqn0zlawvrlkjxry9l71s9h4vd0p")) - (snippet - #~(begin - (use-modules (guix build utils)) - ;; Remove binary blobs which do not contain source or proper - ;; license. + (define (native-build?) + "Return #t if the host and target platforms differ." + (or (not triplet) + ;;%current-system is a *triplet*, unlike its name would suggest. + (string=? (%current-system) (gnu-triplet->nix-system triplet)))) + (package + (name (string-append "arm-trusted-firmware-" platform)) + (version "2.9") + (source + (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://git.trustedfirmware.org" + "/TF-A/trusted-firmware-a.git/")) + (commit (string-append "v" version)))) + (file-name (git-file-name "arm-trusted-firmware" version)) + (sha256 + (base32 "16fjbn1zck0d8b554h8lk1svqqn0zlawvrlkjxry9l71s9h4vd0p")) + (modules '((guix build utils))) + ;; Remove binary blobs: they don't reference a source or license. + (snippet #~(for-each delete-file (find-files "." "\\.bin$"))))) + (build-system gnu-build-system) + (arguments + (list + #:target (and (not (native-build?)) triplet) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) ;no configure script + (replace 'install + (lambda _ (for-each (lambda (file) - (delete-file file)) - (find-files "." "\\.bin$")))))) - (build-system gnu-build-system) - (arguments - (list - #:target (and (not (native-build?)) triplet) - #:phases - #~(modify-phases %standard-phases - (delete 'configure) ;no configure script - (replace 'install - (lambda _ - (for-each (lambda (file) - (install-file file #$output)) - (find-files "." "\\.(bin|elf)$"))))) - #:make-flags #~(list (string-append "PLAT=" #$platform) - #$@(if (not (native-build?)) - (list (string-append "CROSS_COMPILE=" triplet "-")) - '()) - "DEBUG=1") - #:tests? #f)) ;no test suite - (home-page "https://www.trustedfirmware.org/") - (synopsis "Implementation of \"secure world software\"") - (description - "ARM Trusted Firmware provides a reference implementation of secure world -software for ARMv7A and ARMv8-A, including a Secure Monitor executing at -@dfn{Exception Level 3} (EL3). It implements various ARM interface standards, -such as: + (install-file file #$output)) + (find-files "." "\\.(bin|elf)$"))))) + #:make-flags + #~(list (string-append "PLAT=" #$platform) + #$@(if (not (native-build?)) + (list (string-append "CROSS_COMPILE=" triplet "-")) + '()) + "DEBUG=1") + #:tests? #f)) ;no test suite + (home-page "https://www.trustedfirmware.org/") + (synopsis "Secure world software for ARMv7-A and ARMv8-A") + (description + "ARM Trusted Firmware provides a reference implementation of secure +world software for ARMv7-A and ARMv8-A, including a Secure Monitor +executing at @dfn{Exception Level 3} (EL3). It implements various ARM +interface standards, such as: @enumerate @item The Power State Coordination Interface (PSCI) @item Trusted Board Boot Requirements (TBBR, ARM DEN0006C-1) @item SMC Calling Convention @item System Control and Management Interface @item Software Delegated Exception Interface (SDEI) -@end enumerate\n") - (license (list license:bsd-3 - license:bsd-2))))) ; libfdt +@end enumerate") + (license (list license:bsd-3 + license:bsd-2)))) ; libfdt (define-public arm-trusted-firmware-sun50i-a64 (let ((base (make-arm-trusted-firmware "sun50i_a64"))) -- 2.45.2