#74997 - [PATCH 1/5] import: utils: Rename guix-name to downstream-package-name.

Package	Source(s)		Maintainer(s)
guix-patches		PTS Buildd Popcon

Message #14 received at 74997@debbugs.gnu.org (full text, mbox, reply):

Received: (at 74997) by debbugs.gnu.org; 20 Dec 2024 17:35:59 +0000
From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 20 12:35:58 2024
Received: from localhost ([127.0.0.1]:43921 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1tOgus-0004n7-9C
	for submit@debbugs.gnu.org; Fri, 20 Dec 2024 12:35:58 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:46013
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@rimm.ee>) id 1tOguo-0004mD-BC
 for 74997@debbugs.gnu.org; Fri, 20 Dec 2024 12:35:54 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1734716146;
 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=PXvJHN2kTOevePUdDaPlGt09v/c5ZE33yCY66SOmjr4=;
 b=CnrR3rb8KE/JzHIKn9nIRaK2FPlOxxN3RtO7YIjpTEb9ncYthF2v26C/DtWx4OryZAtl0U
 ls1nv3yL25sQEBxHX0Z3aZVo7VycyXIWL0VgjxLycqV/tBRa3hrfjAZp2b2vczmckRJgm3
 o/Gbpm/yifjrI88V75DS5HT3Fqx3j6fxngilZhfhVoYfoWoTkOlwR6sqOxISkyNdtOZ/ZO
 Nbs7U3LPQ12gqqF17dX8ux/bLpsmeLdbweH3CYquKrmiG6qixKSCTpuVYCu/aobUgaP9Xg
 Li6SY4LqX3ItV6t9mhqh+Ik/Zp9si/h/1u1x2WfF34+R64Bybx2BtL7K8NB9kg==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 562dbf05
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <74997@debbugs.gnu.org>; Fri, 20 Dec 2024 17:35:46 +0000 (UTC)
From: Herman Rimm <herman@rimm.ee>
To: 74997@debbugs.gnu.org
Subject: [PATCH 4/5] gnu: make-arm-trusted-firmware: Use
 downstream-package-name.
Date: Fri, 20 Dec 2024 18:35:04 +0100
Message-ID: <e494e0e477473230de3ca7fbac90e1527dd081c2.1734715617.git.herman@rimm.ee>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <e8e619647cf325c69d274e0ff0b49ed9115327ac.1734715617.git.herman@rimm.ee>
References: <e8e619647cf325c69d274e0ff0b49ed9115327ac.1734715617.git.herman@rimm.ee>
MIME-Version: 1.0
X-Debbugs-Cc: Efraim Flashner <efraim@flashner.co.il>,
 Vagrant Cascadian <vagrant@debian.org>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74997
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request@debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit@debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request@debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request@debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/firmware.scm (make-arm-trusted-firmware): Use
downstream-package-name.
[arguments]: Remove configure phase, use fix-cross-build phase instead.
(arm-trusted-firmware-sun50i-a64): Return base package directly.

Change-Id: I23f05ac5e8e897037cd8d8afc4e747b05e56e32d
---
 gnu/packages/firmware.scm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index 89d29b8add..04f138f22c 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -1108,7 +1108,7 @@ (define* (make-arm-trusted-firmware platform #:key
         ;;%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 (downstream-package-name "arm-trusted-firmware-" platform))
     (version "2.12")
     (source
      (origin
@@ -1131,7 +1131,7 @@ (define* (make-arm-trusted-firmware platform #:key
       #:target (and (not (native-build?)) triplet)
       #:phases
       #~(modify-phases %standard-phases
-          (replace 'configure          ;no configure script
+          (add-after 'unpack 'fix-cross-build
             ;; Fix ATF commit ffb7742125def3e0acca4c7e4d3215af5ce25a31
             (lambda _
               (unless #$(native-build?)
@@ -1140,6 +1140,7 @@ (define* (make-arm-trusted-firmware platform #:key
                 (substitute* "make_helpers/build_macros.mk"
                   (("-oc") "-oc-default")
                   (("-od") "-od-default")))))
+          (delete 'configure)          ;no configure script
           (replace 'install
             (lambda _
               (for-each (lambda (file)
@@ -1171,10 +1172,7 @@ (define* (make-arm-trusted-firmware platform #:key
                    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"))
-- 
2.45.2

Display info messages

Send a report that this bug log contains spam.

debbugs.gnu.org maintainers <help-debbugs@gnu.org>. Last modified: Sun Dec 22 10:29:19 2024; Machine Name: wallace-server

GNU bug tracking system

Debbugs is free software and licensed under the terms of the GNU Public License version 2. The current version can be obtained from https://bugs.debian.org/debbugs-source/.

#74997 [PATCH 1/5] import: utils: Rename guix-name to downstream-package-name.