From patchwork Thu Dec 19 22:10:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 35059 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 A88C427BBEC; Thu, 19 Dec 2024 22:12:39 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,TVD_SPACE_RATIO,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 71DFB27BBE9 for ; Thu, 19 Dec 2024 22:12:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOOkh-00033C-CD; Thu, 19 Dec 2024 17:12:15 -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 1tOOkW-000324-IH for guix-patches@gnu.org; Thu, 19 Dec 2024 17:12:07 -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 1tOOkW-0007qA-9W for guix-patches@gnu.org; Thu, 19 Dec 2024 17:12: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:References:In-Reply-To:Date:From:To:Subject; bh=AVpPpFlnDJylzR5OvPIcXVUQYkFdis5QgwsMDvpowlA=; b=BxGwjO6bYLiNHgzeQb2D2lV2wQocs0DeOFvKB1KHfQD8WBqf+3NI+Wc72JdEYreoww9TgSOyllS1holjUgB0d3N0g5zJhSH8sT4GVdTqjl+A0SrPMxmPDU/KrX6eZp7EXUOZKfi8lkD/C4dJkFKpWagd+hhRy44nOqbkntGj+LDiWj/N3iYdO9KTTkSn5gsuTk8nJMup5SvYmFDgJW8E/yWbtKNWRbQhDrzj3rE6w86Nl2FH3OHphcMDKWPqNi4ywOITK0YGVFXP5AfoCcutFE3PAnZ8VnNqSZ9IdFK2rlii17VnunidVS6DZBTn7PKyigOfnp1uatibgZzLGvc82w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOOkU-0007t4-4F; Thu, 19 Dec 2024 17:12:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74849] [PATCH v2 1/6] gnu: arm-trusted-firmware-rk3399: Reformat. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Thu, 19 Dec 2024 22:12: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: 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.173464630630246 (code B ref 74849); Thu, 19 Dec 2024 22:12:02 +0000 Received: (at 74849) by debbugs.gnu.org; 19 Dec 2024 22:11:46 +0000 Received: from localhost ([127.0.0.1]:40437 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOOkE-0007rl-7N for submit@debbugs.gnu.org; Thu, 19 Dec 2024 17:11:46 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:58395 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOOk6-0007qj-Sc for 74849@debbugs.gnu.org; Thu, 19 Dec 2024 17:11:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734646283; 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=AVpPpFlnDJylzR5OvPIcXVUQYkFdis5QgwsMDvpowlA=; b=cAJgcPg+mh6vUgmtEyhZPzoAQ5i6XTNmq95+umy634UitDFD4WvWLxdku1YqB/XzVN+NnF NgUhcjfr5yu4CKdIOmpDvdzR86mFrz+kfZ6I5+9rAkRGPLR2WjCNePFvx1TLPwCfWE9wQb 8Auj3FXMr36PyGFVaa3kdpFoxOyoc3oUM0zJ+DkOjDApElFsAFaEwL/0PfF9gFV35iaBkj GutLYAgwsJ5pPNoVoGsiO8JM99TChuuFZD1uLZz1Xkl9jRHFLWeEAFMl07HmRuirDK47GK rwGs4Gfq9nXe3GruLrgqv783TH2O+ayAX1IjV4D5VSyu36ktqKkLKA9LKGyL8w== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 495a3587 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <74849@debbugs.gnu.org>; Thu, 19 Dec 2024 22:11:23 +0000 (UTC) Date: Thu, 19 Dec 2024 23:10:30 +0100 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 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 X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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 * gnu/packages/firmware.scm (arm-trusted-firmware-rk3399)[name]: Remove. [native-inputs]: Reformat. Change-Id: Ib44246f0c3929fcf8c6f625df53e3a307fc87595 --- gnu/packages/firmware.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 15734b8f9a..8b1873be38 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1177,12 +1177,9 @@ (define-public arm-trusted-firmware-rk3399 (let ((base (make-arm-trusted-firmware "rk3399"))) (package (inherit base) - (name "arm-trusted-firmware-rk3399") - (native-inputs - (modify-inputs (package-native-inputs base) - (prepend - (cross-gcc "arm-none-eabi") - (cross-binutils "arm-none-eabi"))))))) + (native-inputs (modify-inputs (package-native-inputs base) + (prepend (cross-gcc "arm-none-eabi") + (cross-binutils "arm-none-eabi"))))))) (define-public arm-trusted-firmware-imx8mq (let ((base (make-arm-trusted-firmware "imx8mq"))) From patchwork Thu Dec 19 22:10:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 35062 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 E25F427BBE9; Thu, 19 Dec 2024 22:12:44 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 9339727BBE2 for ; Thu, 19 Dec 2024 22:12:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOOkd-000338-HA; Thu, 19 Dec 2024 17:12:11 -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 1tOOkW-00031y-1f for guix-patches@gnu.org; Thu, 19 Dec 2024 17:12:07 -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 1tOOkV-0007px-2J for guix-patches@gnu.org; Thu, 19 Dec 2024 17:12:03 -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=CU7IS1CHQYXz39CXMOKTfeoenWX7VRIJqI7SgXNxcIk=; b=b9Daphyon3AXAt3p8q2XHxXEpAAKJf0Lq1TN7civsvH3F9/tpLcMkIAZY6S36L2jW4DK9AejCmZ1qFA1CwJK8ssWaA4pFQm7uRXbae/1fo24NqSJGutzG6l1exTavuDAY+pNDKoghoG03Hxf1DUTSo6GRIk/rnm2FfBwb3m4DtkKM6UbPdF3vW/uhwbQVeFTSHzLIB9sYG+TRpA1E/by0ZxgsiZ6A1nUWUcQQafXvfeV801s8k6bo3VJqiZJwMkC8o6ov6KHpFC7VqwWR1iBo1ivibWd2Teg1gVMs4spj7WaZJ5H6llI9UtQUdYm7+r3TyBNzpTzazwtw4iwCFE2Ag==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOOkU-0007tC-M5; Thu, 19 Dec 2024 17:12:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74849] [PATCH v2 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: Thu, 19 Dec 2024 22:12: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: 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.173464630730254 (code B ref 74849); Thu, 19 Dec 2024 22:12:02 +0000 Received: (at 74849) by debbugs.gnu.org; 19 Dec 2024 22:11:47 +0000 Received: from localhost ([127.0.0.1]:40439 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOOkE-0007rp-Lc for submit@debbugs.gnu.org; Thu, 19 Dec 2024 17:11:47 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:58395 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOOk7-0007qj-MZ for 74849@debbugs.gnu.org; Thu, 19 Dec 2024 17:11:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734646284; 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=CU7IS1CHQYXz39CXMOKTfeoenWX7VRIJqI7SgXNxcIk=; b=AFFIsBvnzKdRVGWZdKBFGZcCWPUokBbd7kgJOQN36ylFjxK7+bV49g4FiTVrr/+Xsg+EJG Z1CWDz3W0vyzvC1I8z/QCbmKrf5tmuSMB92S7x0PB6s8qYud9atk8tXd2GeWUIRl1S5+bN bvJOTY4HKBKxKmgHj4fisryAR8mHCiNJD+4u48fOTaeNg4g8A8D87rrBRoAqdDkyzmE0hd kudjRIkDcnyvovMkRckt7WtWm/xgxXTSCxNJCSD2r+pqflTL4Ugr0nqe+MHEfh/fpcTsc5 /zaNTfVlVUMOqdQ53aVlW9U8EnMiaOMoE7FzCpxzXEpCLZt7fsy30A5GotEJLw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 1fa918e7 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <74849@debbugs.gnu.org>; Thu, 19 Dec 2024 22:11:24 +0000 (UTC) Date: Thu, 19 Dec 2024 23:10:31 +0100 Message-ID: <823cb78aa5cabca5aac82a51ec77ac5224ba7e9c.1734645720.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 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 X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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 * 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 8b1873be38..758a10d7d2 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1101,68 +1101,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"))) From patchwork Thu Dec 19 22:10:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 35064 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 5726D27BBEA; Thu, 19 Dec 2024 22:13:27 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 C3C9627BBE9 for ; Thu, 19 Dec 2024 22:13:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOOkt-00038t-2e; Thu, 19 Dec 2024 17:12: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 1tOOkl-000352-Pd for guix-patches@gnu.org; Thu, 19 Dec 2024 17:12: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 1tOOkk-0007ri-UV; Thu, 19 Dec 2024 17:12:19 -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=qVoGXffJQEH0hheoxayy7uWM3y9TDo1TKVH4K2HN2xk=; b=f/hEtiIvY5b58d3xxmLZci2nmROOSIPAzWlfWX3iKbIGhA1dgviAmaR44Eh7lKR7+Sytx2QgoDLpoAEtN0g2nzUYYMPmL460c2WhMzsnPnva6vnmQ6JRp0TPRWmKIpISd7nIrdjPab+EJwbAF6HRRq1l2MRacFhByhxGV/Ss19wPzRv7jcqPjmHxM/RXpJ2qARdxw1SCg0rLkc6eC2qAjUWCEKxT8zRJlT1B1w19nMEdO52X8ezE0QAXMH1UdmsCDrryeoF2JKyLWFHK/tvp50BdCHIJ/KcQpDdgpX6fs0rWVpNcvnb9GlHpLU3ndYyrv80/AcV5jY9wxNy88mf6sA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOOkV-0007tX-Go; Thu, 19 Dec 2024 17:12:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74849] [PATCH v2 3/6] import: utils: Move guix-name to (guix utils). Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, andrew@trop.in, guix@cbaines.net, efraim@flashner.co.il, dev@jpoiret.xyz, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, ludo@gnu.org, othacehe@gnu.org, guix@nicolasgoaziou.fr, zimon.toutoune@gmail.com, me@tobias.gr, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Thu, 19 Dec 2024 22:12: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: Andreas Enge , Andrew Tropin , Christopher Baines , Efraim Flashner , Josselin Poiret , Katherine Cox-Buday , Liliana Marie Prikler , Ludovic =?utf-8?q?Court?= =?utf-8?q?=C3=A8s?= , Mathieu Othacehe , Nicolas Goaziou , Simon Tournier , Tobias Geerinckx-Rice , Vagrant Cascadian X-Debbugs-Original-Xcc: Andreas Enge , Andrew Tropin , Christopher Baines , Efraim Flashner , Josselin Poiret , Katherine Cox-Buday , Liliana Marie Prikler , Ludovic =?utf-8?q?Court?= =?utf-8?q?=C3=A8s?= , Mathieu Othacehe , Nicolas Goaziou , Simon Tournier , Tobias Geerinckx-Rice , Vagrant Cascadian Received: via spool by 74849-submit@debbugs.gnu.org id=B74849.173464630730261 (code B ref 74849); Thu, 19 Dec 2024 22:12:03 +0000 Received: (at 74849) by debbugs.gnu.org; 19 Dec 2024 22:11:47 +0000 Received: from localhost ([127.0.0.1]:40441 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOOkF-0007rv-8t for submit@debbugs.gnu.org; Thu, 19 Dec 2024 17:11:47 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:58395 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOOk8-0007qj-N6 for 74849@debbugs.gnu.org; Thu, 19 Dec 2024 17:11:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734646285; 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=qVoGXffJQEH0hheoxayy7uWM3y9TDo1TKVH4K2HN2xk=; b=XrxJXV8mZhyz19gZpw+Chc3vpWIGw4HJ3tSz6rZ23yVleJTiqfpaq3PF+gGiswIgj2kxls IepgF0iexre1WW+PpvoL5yFokvMGJ60Cyvp8L3PdsfT+Uk4fs9NueAE5tK7PW87dF7/4xV dqeUZjGO7t2TNxnX82c7qobuRZsLD5MZp+HTdYI0PGNULjgYUXQ9ksvA+oZAZv6zxE6scl LbRpJ9Ie4+V4OrWoCJpvFOp/L/3Rj0zzb1Ujd1estuyo9OlSIPJEdYm9gmPnMRYVWgyWZC 9aG7EWAzFnbvqrBqklZptlfTj2oaC2qN3diUZB51ti02k7u5oRG4qU6g5YnMDA== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id c853e77a (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <74849@debbugs.gnu.org>; Thu, 19 Dec 2024 22:11:24 +0000 (UTC) Date: Thu, 19 Dec 2024 23:10:32 +0100 Message-ID: <5c695fe4a1cd6ecde7b0ee096bec35c5f7b8c3a8.1734645720.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 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 X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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 * guix/import/elpa.scm: Import (guix utils). * guix/import/texlive.scm (guix-name): Remove. * guix/import/utils.scm (guix-name): Move to ... * guix/utils.scm (guix-name): ... here. Change-Id: If56a452f64ed06c8bb06a96a283a5067cb54d602 --- guix/import/elpa.scm | 1 + guix/import/texlive.scm | 10 +--------- guix/import/utils.scm | 10 ---------- guix/utils.scm | 9 +++++++++ 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm index 46b6dc98a2..11559097b5 100644 --- a/guix/import/elpa.scm +++ b/guix/import/elpa.scm @@ -44,6 +44,7 @@ (define-module (guix import elpa) #:use-module (guix git) #:use-module (guix hash) #:use-module (guix store) + #:use-module ((guix utils) #:select (guix-name)) #:use-module (guix base32) #:use-module (guix upstream) #:use-module (guix packages) diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm index 6d04cc25ee..b2e99c40f2 100644 --- a/guix/import/texlive.scm +++ b/guix/import/texlive.scm @@ -35,6 +35,7 @@ (define-module (guix import texlive) #:use-module (guix store) #:use-module (guix svn-download) #:use-module (guix upstream) + #:use-module ((guix utils) #:select (guix-name)) #:use-module (ice-9 ftw) #:use-module (ice-9 match) #:use-module (ice-9 popen) @@ -334,15 +335,6 @@ (define string->license ((lst ...) `(list ,@(map string->license lst))) (x `(error unknown-license ,x)))) -(define (guix-name name) - "Return a Guix package name for a given Texlive package NAME." - (string-append "texlive-" - (string-map (match-lambda - (#\_ #\-) - (#\. #\-) - (chr (char-downcase chr))) - name))) - (define* (filter-depends depends #:optional texlive-only) "Filter upstream package names DEPENDS to include only their equivalent Guix package names, without \"texlive-\" prefix. When TEXLIVE-ONLY is true, ignore diff --git a/guix/import/utils.scm b/guix/import/utils.scm index e45c8dfb20..058d2bc094 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -82,8 +82,6 @@ (define-module (guix import utils) read-lines chunk-lines - guix-name - recursive-import)) (define (factorize-uri uri version) @@ -612,14 +610,6 @@ (define* (chunk-lines lines #:optional (pred string-null?)) (reverse res) (loop (cdr after) res)))))) -(define (guix-name prefix name) - "Return a Guix package name for a given package name." - (string-append prefix (string-map (match-lambda - (#\_ #\-) - (#\. #\-) - (chr (char-downcase chr))) - name))) - (define (topological-sort nodes node-dependencies node-name) diff --git a/guix/utils.scm b/guix/utils.scm index 537d0490e0..dfa8f0f19b 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -91,6 +91,7 @@ (define-module (guix utils) %current-system %current-target-system package-name->name+version + guix-name target-linux? target-hurd? system-hurd? @@ -706,6 +707,14 @@ (define* (package-name->name+version spec (idx (values (substring spec 0 idx) (substring spec (1+ idx)))))) +(define (guix-name prefix name) + "Return a Guix package name for a given package name." + (string-append prefix (string-map (match-lambda + (#\_ #\-) + (#\. #\-) + (chr (char-downcase chr))) + name))) + (define* (target-linux? #:optional (target (or (%current-target-system) (%current-system)))) "Does the operating system of TARGET use the Linux kernel?" From patchwork Thu Dec 19 22:10:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 35058 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 12C5E27BBEA; Thu, 19 Dec 2024 22:12:32 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 B5C0F27BBE2 for ; Thu, 19 Dec 2024 22:12:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOOkc-000331-2H; Thu, 19 Dec 2024 17:12:10 -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 1tOOkX-00032E-O8 for guix-patches@gnu.org; Thu, 19 Dec 2024 17:12:07 -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 1tOOkX-0007qf-ER for guix-patches@gnu.org; Thu, 19 Dec 2024 17:12:05 -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=PPWD3sH6w4kPkveLTHJ+h/nVsoOZvr/DbTUEz9/tyz0=; b=FTcMWRzNhV5cT0AwJ0v1atOkIQsN8cDitmMl95dcpc7w59/SeeGw4RujZClOehztn7+8wvxlZitOk3oe9IGWsIjgI5GISgRrnWfr5cFcTzmVu1qqxlXGb2hEVgMTgH3kr7K/ZqlTx6Ah6UEl/VVRWSMkaHUqUvY6erIGqgoFc1L9QsG9wkFkmy7Ok9Dn3RLbF87M6Rtpj7/N6tDtQq0YSxP5Ekucj+LvoFbHKZXtu43GB/UU0eCJCJ9VCc092814yXwHv4F0JWEacAAEDZrcVkshl3r3BUwDS3Al6NttnJ0aDpQ9MtizxIKdZ2JUjSimtIX2BhhEhUJXYNNqcF7q8Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOOkW-0007th-3A; Thu, 19 Dec 2024 17:12:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74849] [PATCH v2 4/6] gnu: make-arm-trusted-firmware: Use guix-name. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Thu, 19 Dec 2024 22:12: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.173464630830269 (code B ref 74849); Thu, 19 Dec 2024 22:12:03 +0000 Received: (at 74849) by debbugs.gnu.org; 19 Dec 2024 22:11:48 +0000 Received: from localhost ([127.0.0.1]:40443 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOOkF-0007s2-Oo for submit@debbugs.gnu.org; Thu, 19 Dec 2024 17:11:48 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:58395 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOOk9-0007qj-FT for 74849@debbugs.gnu.org; Thu, 19 Dec 2024 17:11:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734646285; 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=PPWD3sH6w4kPkveLTHJ+h/nVsoOZvr/DbTUEz9/tyz0=; b=nUboUumKQIWCS43Pc6Y/ft8skqKrPIqCASAJNUa7DdWx3/i4PW4nUV5vp6KtzzdTWgS6vq UB1aOCiRVYiJoxxFhbVPUx7aan54alEVS2pYzxzHuSgvJN/VxBISfC64dCWTbrs4qEA2Xv +ZJ2sAbpdlg8vvVcOtznrsSyeTqfspG1QFrlWmQ/LKMOsbTufuBHEngHOPXnr86pcbRnCk qRj0fs77+R0LBVAJ/IFf++cpwEhPDii1LqKL39pe6jwOebvqFzV2tQCTvQvJuqY5StVSk6 E/RU1TUlFxzEXKA2/BzEjc2afCLFQLeB8ieRibIaN1aud8Qj9mgbLoF0abBQbQ== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 9a1b1e2f (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <74849@debbugs.gnu.org>; Thu, 19 Dec 2024 22:11:25 +0000 (UTC) Date: Thu, 19 Dec 2024 23:10:33 +0100 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 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 X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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 * gnu/packages/firmware.scm (make-arm-trusted-firmware): Use guix-name. (arm-trusted-firmware-sun50i-a64): Return base package directly. Change-Id: I23f05ac5e8e897037cd8d8afc4e747b05e56e32d --- gnu/packages/firmware.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 758a10d7d2..3e76681c66 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1107,7 +1107,7 @@ (define* (make-arm-trusted-firmware platform ;;%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)) + (name (guix-name "arm-trusted-firmware-" platform)) (version "2.9") (source (origin @@ -1159,10 +1159,7 @@ (define* (make-arm-trusted-firmware platform license:bsd-2)))) ; libfdt (define-public arm-trusted-firmware-sun50i-a64 - (let ((base (make-arm-trusted-firmware "sun50i_a64"))) - (package - (inherit base) - (name "arm-trusted-firmware-sun50i-a64")))) + (make-arm-trusted-firmware "sun50i_a64")) (define-public arm-trusted-firmware-rk3328 (make-arm-trusted-firmware "rk3328")) From patchwork Thu Dec 19 22:10:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 35061 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 ED1E627BBE2; Thu, 19 Dec 2024 22:12: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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 C142627BBE9 for ; Thu, 19 Dec 2024 22:12:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOOkm-00035L-4Z; Thu, 19 Dec 2024 17:12:20 -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 1tOOkX-000327-3Z for guix-patches@gnu.org; Thu, 19 Dec 2024 17:12:07 -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 1tOOkW-0007qW-RD for guix-patches@gnu.org; Thu, 19 Dec 2024 17:12: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:References:In-Reply-To:Date:From:To:Subject; bh=p0hDgotjIC0W4dCzBEeewC7ugzFv+Z063LQQz4t4oTg=; b=PYlNVk5PP4nW4V33V0ADHiMa7RoocqU565tRtnnkGHja7byp9Cm/KeX5n16/QmzbNUehjeGPOU2nMkPNBXEW6s6Li4txYTe6DQf0+zPinHY7Sm8V82kReVj1WoViBJic+L0y/XTAijS9VY8jYEWJcWueYbsT+TqSK7xj/E+P99X8qsFRv+4n1b+yfPV2vvzVDRBjp5jMrMccjL/UfOHeLgs9WlMgp/W0CGB2AR1sSxc3cgz8LpLb4FocsOuuDt8mmMMIJU8pp2Njm9oWpMKtQTKsiIyXiMtQJXMOzhWsMPGuv5vkp6TDmoHYZ2bPrt2sMBOzeLdHqeIC7XKL9siRPg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOOkW-0007tr-Ki; Thu, 19 Dec 2024 17:12:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74849] [PATCH v2 5/6] gnu: make-arm-trusted-firmware: Update to 2.12. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Thu, 19 Dec 2024 22:12:04 +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.173464630830276 (code B ref 74849); Thu, 19 Dec 2024 22:12:04 +0000 Received: (at 74849) by debbugs.gnu.org; 19 Dec 2024 22:11:48 +0000 Received: from localhost ([127.0.0.1]:40445 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOOkG-0007sA-4w for submit@debbugs.gnu.org; Thu, 19 Dec 2024 17:11:48 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:58395 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOOkA-0007qj-6t for 74849@debbugs.gnu.org; Thu, 19 Dec 2024 17:11:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734646285; 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=p0hDgotjIC0W4dCzBEeewC7ugzFv+Z063LQQz4t4oTg=; b=hQ7l46FXuTIx2JJAgUDGFv27ouFq3wPKk8lvBiEbF0pFGqDAbkRUZLl/VcjJJDPCf7XTEm RrYFLgZgpQ4mOShLv+ggQmAkqrHtBSc1uOnFWCKUutfzbP9OTBDfhoQcLK8Rk86fOn+PJt VstTwQyutrkL9z8CDiQVSrJymZ10qPjz+UQum+iqAAk2jxV+aEA3IXBqj10gZgvkkKrnwy g+xF7vTg0V0uEX7i3eRdsr16uRawQ5yN9c6/xZYH70bjYnki4WOBKC0n9l9HDCVRlvUgWQ R9u8FJz9SZa8/jnQc9Se0QhNyRm+EEIKj3tSE+7ArteMIKyywPMwc4ck9aOUpg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 3537c64c (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <74849@debbugs.gnu.org>; Thu, 19 Dec 2024 22:11:25 +0000 (UTC) Date: Thu, 19 Dec 2024 23:10:34 +0100 Message-ID: <252aca03db260a19297a87d50cc539c1cace1ebb.1734645720.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 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 X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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 * gnu/packages/firmware.scm (make-arm-trusted-firmware): Update to 2.12. [arguments]: Select correct objcopy and objdump variants. [native-inputs]: Add python to avoid warnings. Change-Id: Iccff10b16090913fe5c99491d8335f8ede09038c --- gnu/packages/firmware.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 3e76681c66..81ebd5efd8 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1108,7 +1108,7 @@ (define* (make-arm-trusted-firmware platform (string=? (%current-system) (gnu-triplet->nix-system triplet)))) (package (name (guix-name "arm-trusted-firmware-" platform)) - (version "2.9") + (version "2.12") (source (origin (method git-fetch) @@ -1118,7 +1118,7 @@ (define* (make-arm-trusted-firmware platform (commit (string-append "v" version)))) (file-name (git-file-name "arm-trusted-firmware" version)) (sha256 - (base32 "16fjbn1zck0d8b554h8lk1svqqn0zlawvrlkjxry9l71s9h4vd0p")) + (base32 "18rzhygvq0afcylirq9yis3kaa1nli14k2jrm64ih85gz4nhl99w")) (modules '((guix build utils))) ;; Remove binary blobs: they don't reference a source or license. (snippet #~(for-each delete-file (find-files "." "\\.bin$"))))) @@ -1128,7 +1128,15 @@ (define* (make-arm-trusted-firmware platform #:target (and (not (native-build?)) triplet) #:phases #~(modify-phases %standard-phases - (delete 'configure) ;no configure script + (replace 'configure ;no configure script + ;; Fix ATF commit ffb7742125def3e0acca4c7e4d3215af5ce25a31 + (lambda _ + (unless #$(native-build?) + (substitute* "plat/rockchip/rk3399/drivers/m0/Makefile" + (("-oc") "-oc-default")) + (substitute* "make_helpers/build_macros.mk" + (("-oc") "-oc-default") + (("-od") "-od-default"))))) (replace 'install (lambda _ (for-each (lambda (file) @@ -1138,9 +1146,10 @@ (define* (make-arm-trusted-firmware platform #~(list (string-append "PLAT=" #$platform) #$@(if (not (native-build?)) (list (string-append "CROSS_COMPILE=" triplet "-")) - '()) + '("CC=gcc")) "DEBUG=1") #:tests? #f)) ;no test suite + (native-inputs (list python)) (home-page "https://www.trustedfirmware.org/") (synopsis "Secure world software for ARMv7-A and ARMv8-A") (description From patchwork Thu Dec 19 22:10:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 35063 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 DA36F27BBEA; Thu, 19 Dec 2024 22:12:46 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 11E4C27BBE2 for ; Thu, 19 Dec 2024 22:12:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOOkh-00033c-Ov; Thu, 19 Dec 2024 17:12:15 -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 1tOOkX-00032G-Sz for guix-patches@gnu.org; Thu, 19 Dec 2024 17:12:07 -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 1tOOkX-0007qh-Hl for guix-patches@gnu.org; Thu, 19 Dec 2024 17:12:05 -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=L68rz6CPRym1MXeQo+0wQrYP6+EEAK+qGXwVHupYwrs=; b=B4Bi+yjMl4V4SvZi3FeiSqHRTfcvpOJYxpfm1B2EBLQXacpK8OY0P23gCvfblxNjip/JuxmbdqmZf5WkfXc12S1FdmtCIyIOSz2xDusZ2exxyohnKe2mc+UqOwOmC9V6tQ/lLtPuo5SBrZko9swfriqgTNjb/ocRcWPkb0IPstE+9YR6Uta5TTcXUF7U3/RabJAWMZa2tseGd9pMCNZ556EnHQ0zZyeKm4EaMw+TbA1RCerKqxPto5i9USD9hSm7jv3vpgKtdpswTBKsjMI2pFMHwA76a7X/A378m+wDgpdxDAVXQnbYQ9Te6/40kRcjOnNZN/UtY0HmYAFKD68jlw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOOkX-0007u1-6Y; Thu, 19 Dec 2024 17:12:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74849] [PATCH v2 6/6] gnu: arm-trusted-firmware-imx8mq: Fix build. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Thu, 19 Dec 2024 22:12:05 +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.173464630930283 (code B ref 74849); Thu, 19 Dec 2024 22:12:05 +0000 Received: (at 74849) by debbugs.gnu.org; 19 Dec 2024 22:11:49 +0000 Received: from localhost ([127.0.0.1]:40447 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOOkG-0007sH-MM for submit@debbugs.gnu.org; Thu, 19 Dec 2024 17:11:49 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:38239 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOOkA-0007qq-6t for 74849@debbugs.gnu.org; Thu, 19 Dec 2024 17:11:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734646286; 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=L68rz6CPRym1MXeQo+0wQrYP6+EEAK+qGXwVHupYwrs=; b=JozMWzfvecoUlIskO/V5FtSPMPs35oTKR43hshfvYK0S3Lyq/41n8EWJU2uoWX51EnJk19 636bBXwCSrhHsBFadK6HjpKTW2uPrkj9GJDQ6H5dJ1JvFvPXw0Tf7m7iM1PnL1w0vpwupW I+ccvqx6AVZVheTPmCyKBLKr2/AX/jCdp9Q0Ib3q7xcJZcCoehFho3/vKMjHy+dMN5lfOL HWpAFc/ExeYQ9sMicNzZGEGg52zg6jfJQlublX/kuVMUkh0EK4jlnkcZAbalzSpf3w2SvE nlgY42kyniiTWBkoajBMvEW6CsBYekaxEiir0HtOHJQYh8QemKUpibAMzmZb/A== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 5505c856 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <74849@debbugs.gnu.org>; Thu, 19 Dec 2024 22:11:26 +0000 (UTC) Date: Thu, 19 Dec 2024 23:10:35 +0100 Message-ID: <467ea8c43a9f99b9202ae603c378d31106851f0b.1734645720.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 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 X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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 * gnu/local.mk (dist_patch_DATA): Register patches. * gnu/packages/firmware.scm (make-arm-trusted-firmware): Add make-flags argument. [source]: Use patches. (arm-trusted-firmware-imx8mq): Refactor. * gnu/packages/patches/8mq-enable-imx_hab_handler.patch: Add file. * gnu/packages/patches/8mq-move-stack-to-ocram_s.patch: Add file. Change-Id: I8a72c1ceb5e00e113ae91a7c2f5b733d981185d6 --- gnu/local.mk | 2 + gnu/packages/firmware.scm | 35 ++------ .../patches/8mq-enable-imx_hab_handler.patch | 36 ++++++++ .../patches/8mq-move-stack-to-ocram_s.patch | 88 +++++++++++++++++++ 4 files changed, 134 insertions(+), 27 deletions(-) create mode 100644 gnu/packages/patches/8mq-enable-imx_hab_handler.patch create mode 100644 gnu/packages/patches/8mq-move-stack-to-ocram_s.patch diff --git a/gnu/local.mk b/gnu/local.mk index fbe9dfbb0e..8155a5ae34 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -934,6 +934,8 @@ MODULES_NOT_COMPILED += \ patchdir = $(guilemoduledir)/%D%/packages/patches dist_patch_DATA = \ + %D%/packages/patches/8mq-enable-imx_hab_handler.patch \ + %D%/packages/patches/8mq-move-stack-to-ocram_s.patch \ %D%/packages/patches/abcl-fix-build-xml.patch \ %D%/packages/patches/ableton-link-system-libraries-debian.patch \ %D%/packages/patches/abiword-explictly-cast-bools.patch \ diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 81ebd5efd8..6f6a406c8b 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1099,8 +1099,9 @@ (define-public ovmf-riscv64 (define-public ovmf (deprecated-package "ovmf" ovmf-x86-64)) -(define* (make-arm-trusted-firmware platform - #:key (triplet "aarch64-linux-gnu")) +(define* (make-arm-trusted-firmware platform #:key + (triplet "aarch64-linux-gnu") + (make-flags '("DEBUG=1"))) (define (native-build?) "Return #t if the host and target platforms differ." (or (not triplet) @@ -1119,6 +1120,8 @@ (define* (make-arm-trusted-firmware platform (file-name (git-file-name "arm-trusted-firmware" version)) (sha256 (base32 "18rzhygvq0afcylirq9yis3kaa1nli14k2jrm64ih85gz4nhl99w")) + (patches (search-patches "8mq-enable-imx_hab_handler.patch" + "8mq-move-stack-to-ocram_s.patch")) (modules '((guix build utils))) ;; Remove binary blobs: they don't reference a source or license. (snippet #~(for-each delete-file (find-files "." "\\.bin$"))))) @@ -1147,7 +1150,7 @@ (define* (make-arm-trusted-firmware platform #$@(if (not (native-build?)) (list (string-append "CROSS_COMPILE=" triplet "-")) '("CC=gcc")) - "DEBUG=1") + #$@make-flags) #:tests? #f)) ;no test suite (native-inputs (list python)) (home-page "https://www.trustedfirmware.org/") @@ -1182,30 +1185,8 @@ (define-public arm-trusted-firmware-rk3399 (cross-binutils "arm-none-eabi"))))))) (define-public arm-trusted-firmware-imx8mq - (let ((base (make-arm-trusted-firmware "imx8mq"))) - (package - (inherit base) - ;; Newer versions do not build and are essentially not supported - ;; upstream. - ;; XXX: explore using NXP maintained branch - ;; https://github.com/nxp-imx/imx-atf - (version "2.8") - (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 - "0grq3fgxi9xhcljnhwlxjvdghyz15gaq50raw41xy4lm8rkmnzp3")))) - (arguments - (substitute-keyword-arguments (package-arguments base) - ((#:make-flags flags ''()) - ;; Adding debug symbols causes the size to exceed limits. - #~(delete "DEBUG=1" #$flags))))))) + ;; Remove debug symbols because of limited OCRAM. + (make-arm-trusted-firmware "imx8mq" #:make-flags '())) (define make-crust-firmware (mlambda (platform) diff --git a/gnu/packages/patches/8mq-enable-imx_hab_handler.patch b/gnu/packages/patches/8mq-enable-imx_hab_handler.patch new file mode 100644 index 0000000000..0ead773e4e --- /dev/null +++ b/gnu/packages/patches/8mq-enable-imx_hab_handler.patch @@ -0,0 +1,36 @@ +From: Herman Rimm +Date: Sun, 8 Dec 2024 01:13:59 +0100 +Subject: [PATCH] fix(imx8m): 8mq: enable imx_hab_handler + +This completes af799814e2639a03b3453744f06a73e77cb66e86. + +Signed-off-by: Herman Rimm +--- +To submit to review.trustedfirmware.org, sign in with a GitHub account. + +diff --git a/plat/imx/common/include/imx_sip_svc.h b/plat/imx/common/include/imx_sip_svc.h +index 404a82959..1948bc2eb 100644 +--- a/plat/imx/common/include/imx_sip_svc.h ++++ b/plat/imx/common/include/imx_sip_svc.h +@@ -88,7 +88,8 @@ int imx_src_handler(uint32_t smc_fid, u_register_t x1, + u_register_t x2, u_register_t x3, void *handle); + #endif + +-#if defined(PLAT_imx8mm) || defined(PLAT_imx8mn) || defined(PLAT_imx8mp) ++#if defined(PLAT_imx8mm) || defined(PLAT_imx8mn) || defined(PLAT_imx8mp) || \ ++ defined(PLAT_imx8mq) + int imx_hab_handler(uint32_t smc_fid, u_register_t x1, + u_register_t x2, u_register_t x3, u_register_t x4); + #endif +diff --git a/plat/imx/imx8m/imx8mq/platform.mk b/plat/imx/imx8m/imx8mq/platform.mk +index 73179dd0c..b1b954f1d 100644 +--- a/plat/imx/imx8m/imx8mq/platform.mk ++++ b/plat/imx/imx8m/imx8mq/platform.mk +@@ -30,6 +30,7 @@ BL31_SOURCES += plat/imx/common/imx8_helpers.S \ + plat/imx/imx8m/imx8mq/imx8mq_psci.c \ + plat/imx/imx8m/gpc_common.c \ + plat/imx/imx8m/imx_aipstz.c \ ++ plat/imx/imx8m/imx_hab.c \ + plat/imx/imx8m/imx8m_caam.c \ + plat/imx/imx8m/imx8m_ccm.c \ + plat/imx/imx8m/imx8m_psci_common.c \ diff --git a/gnu/packages/patches/8mq-move-stack-to-ocram_s.patch b/gnu/packages/patches/8mq-move-stack-to-ocram_s.patch new file mode 100644 index 0000000000..1174881181 --- /dev/null +++ b/gnu/packages/patches/8mq-move-stack-to-ocram_s.patch @@ -0,0 +1,88 @@ +From: Jacky Bai +Date: Tue, 7 Jan 2020 15:48:36 +0800 +Subject: [PATCH] plat: imx8mq: move the stack & xlat table into ocram_s + +Move the stack & xlat table into ocram_s due to the +ocram is not enough. + +Signed-off-by: Jacky Bai +Change-Id: I40a8e6c91f707598a38e420ff9f4be0c0a5dbf6c +--- +Commit ae90cc5773abf5656e0e49f2ce746aa54f712b7b of: +https://github.com/nxp-imx/imx-atf.git + +diff --git a/bl31/bl31.ld.S b/bl31/bl31.ld.S +index 867dedb99..8be52bc7c 100644 +--- a/bl31/bl31.ld.S ++++ b/bl31/bl31.ld.S +@@ -25,6 +25,10 @@ MEMORY { + #else /* SEPARATE_RWDATA_REGION */ + #define RAM_RW RAM + #endif /* SEPARATE_RWDATA_REGION */ ++ ++#if XLAT_TABLE_IN_OCRAM_S ++ RAM_S (rwx): ORIGIN = 0x180000, LENGTH = 0x8000 ++#endif + } + + #ifdef PLAT_EXTRA_LD_SCRIPT +@@ -198,9 +202,13 @@ SECTIONS { + __NOBITS_START__ = .; + #endif /* SEPARATE_NOBITS_REGION */ + ++#if !STACK_IN_OCRAM_S + STACK_SECTION >NOBITS ++#endif + BSS_SECTION >NOBITS ++#if !XLAT_TABLE_IN_OCRAM_S + XLAT_TABLE_SECTION >NOBITS ++#endif + + #if USE_COHERENT_MEM + /* +@@ -253,4 +261,15 @@ SECTIONS { + /DISCARD/ : { + *(.dynsym .dynstr .hash .gnu.hash) + } ++ ++#if XLAT_TABLE_IN_OCRAM_S ++ . = 0x180000; ++ XLAT_TABLE_SECTION >RAM_S ++ ++#if STACK_IN_OCRAM_S ++ STACK_SECTION >RAM_S ++#endif ++ ++ASSERT(. <= OCRAM_S_LIMIT, "OCRAM_S limit has been exceeded.") ++#endif + } +diff --git a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c +index 70c2def7d..ddff0925c 100644 +--- a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c ++++ b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c +@@ -48,6 +48,7 @@ static uint8_t mmio_read_8_ldrb(uintptr_t address) + static const mmap_region_t imx_mmap[] = { + MAP_REGION_FLAT(GPV_BASE, GPV_SIZE, MT_DEVICE | MT_RW), /* GPV map */ + MAP_REGION_FLAT(IMX_ROM_BASE, IMX_ROM_SIZE, MT_MEMORY | MT_RO), /* ROM map */ ++ MAP_REGION_FLAT(OCRAM_S_BASE, OCRAM_S_SIZE, MT_MEMORY | MT_RW), /* ROM map */ + MAP_REGION_FLAT(IMX_AIPS_BASE, IMX_AIPS_SIZE, MT_DEVICE | MT_RW), /* AIPS map */ + MAP_REGION_FLAT(IMX_GIC_BASE, IMX_GIC_SIZE, MT_DEVICE | MT_RW), /* GIC map */ + MAP_REGION_FLAT(IMX_DDRPHY_BASE, IMX_DDR_IPS_SIZE, MT_DEVICE | MT_RW), /* DDRMIX map */ +diff --git a/plat/imx/imx8m/imx8mq/platform.mk b/plat/imx/imx8m/imx8mq/platform.mk +index 73179dd0c..20a73d691 100644 +--- a/plat/imx/imx8m/imx8mq/platform.mk ++++ b/plat/imx/imx8m/imx8mq/platform.mk +@@ -45,7 +45,12 @@ BL31_SOURCES += plat/imx/common/imx8_helpers.S \ + ${XLAT_TABLES_LIB_SRCS} \ + ${IMX_GIC_SOURCES} + +-ENABLE_PIE := 1 ++XLAT_TABLE_IN_OCRAM_S := 1 ++STACK_IN_OCRAM_S := 1 ++ ++$(eval $(call add_define,XLAT_TABLE_IN_OCRAM_S)) ++$(eval $(call add_define,STACK_IN_OCRAM_S)) ++ + USE_COHERENT_MEM := 1 + RESET_TO_BL31 := 1 + A53_DISABLE_NON_TEMPORAL_HINT := 0