From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 2OxUIvKtZGdtHAAAqHPOHw:P1 (envelope-from ) for ; Thu, 19 Dec 2024 23:36:18 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id 2OxUIvKtZGdtHAAAqHPOHw (envelope-from ) for ; Fri, 20 Dec 2024 00:36:18 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="W3DYGz3/"; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=hRan9lSR; 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"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734651378; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: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=yGWqHBvRw4kAoipPJ92yerKmrJBsUd6ie2Qb3WM5/2E=; b=hbOEvhwlF3J3pP5GGgAQ71hvklJJL0UhnliwndMFW4reE1BpU/Cn3huURu2SwDK8JJAUsx ZyjE4PCJRB9qdjWCu29X8lFLfo72VAYilIyb8Oky3qbqO7sTMCV8GA9GQDX7trnJaQo6qO SLQsjKsvmMEpzTM7d+HSz8pc6aEdyzNfE+t1LfWwqkc2Rvj5+revlk8ai61X5rsmTc8HOj DiNL/1T6i4ZfAa0+ZcYfyqdl2WSUnkgk+FLVbCGMLiusVyJqlFwMWFDk0S/ueFErwKb+Dt GWXMh6FWiiWqZkH5vx1YK05aeMn8nTzRF0O6XlDLlUaP/uo6yyECek6i1QdBAA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734651378; a=rsa-sha256; cv=none; b=fr9hNYB67sqlW8jTGtVPPEC0kWXTNZLjm++eXCB+TSF4G+l5kSC7ILkOyFkU2A0KcJTWuE UuvpPZ/IJGI7NvA2PKDH/Bd8q3js7AYqxW8SC52vtgVw4WkDLV4nq5O1s/z6sGGoYjNoNs qn/UtkG05aHfgBMl+HqqDW3dhYQQMFJCG1p+4T+0LpI35bLYzfgVT338J7MJSl1Ec+7H4n H+9h2SGlEKCBNF/9TnmXKQCLosx4k0RZEvPTU9njuFocfizx7f8LbHlhjO7VvmS9yXsE3l PrGT/EPkDbWljl709GCF9T7p91kSRerz9KLlYTGTQFJQoHUeIhFj5KlvqZwBpg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="W3DYGz3/"; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=hRan9lSR; 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"; dmarc=none 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 CFD1B8F781 for ; Fri, 20 Dec 2024 00:36:17 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOQ3s-0005gx-DM; Thu, 19 Dec 2024 18:36:08 -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 1tOQ3p-0005gi-3E for guix-patches@gnu.org; Thu, 19 Dec 2024 18:36:05 -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 1tOQ3n-0004N6-M6 for guix-patches@gnu.org; Thu, 19 Dec 2024 18:36:04 -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:Date:References:In-Reply-To:From:To:Subject; bh=yGWqHBvRw4kAoipPJ92yerKmrJBsUd6ie2Qb3WM5/2E=; b=W3DYGz3/LZQzI18mEXQddItIVwp+4uECbfPjACer4Y3kc8gGW6kPNumu+KkchxzNYIUycbg0G2M5vKi5cBIwJt2XWfqrP7ZInVuNR8sM8oHo5ZAuWUUfaDiG/W31Zn83tDHBGxwigD+n5S7qMP37//tec6gJt4CrYUUSXp8Zeex9InhH3UHk0iV4eGxJWWR9G2X9dpNTWbbmTL3AXLjVZheG0mXJQTWstVo9VroImet1kXXVW5DpOBvIRIoMOnivS6+NTBIE3rNm8XD6Q/bi9JP257ZSDLjZYWSmMJ9CVkUsPgt1J2UQoCAYoDPoBwLSs/6ilfUaiLe4/1SX70nIaQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOQ3m-0003MX-GK for guix-patches@gnu.org; Thu, 19 Dec 2024 18:36:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74849] [PATCH v2 2/6] gnu: arm-trusted-firmware: Reformat. Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Dec 2024 23:36:02 +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: Herman Rimm , 74849@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 74849-submit@debbugs.gnu.org id=B74849.173465130912694 (code B ref 74849); Thu, 19 Dec 2024 23:36:02 +0000 Received: (at 74849) by debbugs.gnu.org; 19 Dec 2024 23:35:09 +0000 Received: from localhost ([127.0.0.1]:40644 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOQ2u-0003Ib-F6 for submit@debbugs.gnu.org; Thu, 19 Dec 2024 18:35:08 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:43894) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOQ2r-0003Es-PD for 74849@debbugs.gnu.org; Thu, 19 Dec 2024 18:35:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1734651270; bh=/kvKwwiuOfuKeM5KBfl6YP8S1ANoM3v01w5PP5O9EhY=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=hRan9lSRqtq83oNnm2zJBKYvfJOeECKp6l+P5QxtRoxrGXdYi8r5L/n8b68xLW4az v8ok1o9giMhYwnhG1fF1JBiiIFIvLYzhdNmUWTi21F6oiLEULONjPpsN7U/xwfpn+R YxQp2u/kaNlROHK170/vOs55EyqIWTvtWhFfcZoThjrDm45eAhu7Mv5/nWt0fbpBvV v1yvt5wzd73iGA8oo7RqvCVOrBu+ktTxyKLvtSsdFaSdqxse04udlLCl38BuIBm6LZ NbuxYbtt2bFrAFkawN0IfDPhjTRHIvWKemZ/6Tisz2v/wJFkMff9pNpKB2RE4aaluw uNYE91VUCEw7w== Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) by cascadia.aikidev.net (Postfix) with ESMTPSA id 0E04BA0; Thu, 19 Dec 2024 15:34:30 -0800 (PST) From: Vagrant Cascadian In-Reply-To: <823cb78aa5cabca5aac82a51ec77ac5224ba7e9c.1734645720.git.herman@rimm.ee> References: <823cb78aa5cabca5aac82a51ec77ac5224ba7e9c.1734645720.git.herman@rimm.ee> Date: Thu, 19 Dec 2024 15:34:23 -0800 Message-ID: <87o717uu0w.fsf@contorta> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -9.99 X-Spam-Score: -9.99 X-Migadu-Queue-Id: CFD1B8F781 X-TUID: vxPlb9/YHZlP --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On 2024-12-19, Herman Rimm wrote: > * gnu/packages/firmware.scm (arm-trusted-firmware)[source]: Use modules. What is this referring to? What modules that were not used before? > [synopsis]: Mention supported architectures. > [description]: Fix "ARMv7A" typo. Remove newline. These are good, thanks! What I do not see mentioned is that it reworks how "native-build?" is used a bit. Could that be split in a separate patch? live well, vagrant > 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 8b1873be38..758a10d7d2 100644 > --- a/gnu/packages/firmware.scm > +++ b/gnu/packages/firmware.scm > @@ -1101,68 +1101,62 @@ (define-public ovmf >=20=20 > (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=3D? (%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-firmwa= re-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 prop= er > - ;; 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=3D? (%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=3D" #$platform) > - #$@(if (not (native-build?)) > - (list (string-append "CROSS_COMPILE= =3D" triplet "-")) > - '()) > - "DEBUG=3D1") > - #: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 secu= re world > -software for ARMv7A and ARMv8-A, including a Secure Monitor executing at > -@dfn{Exception Level 3} (EL3). It implements various ARM interface stan= dards, > -such as: > + (install-file file #$output)) > + (find-files "." "\\.(bin|elf)$"))))) > + #:make-flags > + #~(list (string-append "PLAT=3D" #$platform) > + #$@(if (not (native-build?)) > + (list (string-append "CROSS_COMPILE=3D" triplet "-"= )) > + '()) > + "DEBUG=3D1") > + #: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 >=20=20 > (define-public arm-trusted-firmware-sun50i-a64 > (let ((base (make-arm-trusted-firmware "sun50i_a64"))) > --=20 > 2.45.2 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZ2StgAAKCRDcUY/If5cW qoOXAP46uYi9MSUnZxRkOIUu24G85yXyA38gJ01tUYriwhTtXAD5AVxpyxttP+f2 E7BtLpgMfLNGGhAiP0KR6OUEm4rHyAI= =RwrP -----END PGP SIGNATURE----- --=-=-=--