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 +OQ5GyyrZWdIxwAAe85BDQ:P1 (envelope-from ) for ; Fri, 20 Dec 2024 17:36:44 +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 +OQ5GyyrZWdIxwAAe85BDQ (envelope-from ) for ; Fri, 20 Dec 2024 18:36:44 +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=rZ8cFUQ3; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=CnrR3rb8; 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=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734716204; 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=PXvJHN2kTOevePUdDaPlGt09v/c5ZE33yCY66SOmjr4=; b=HSXJUm7KpPRGBrYYi/vH6L5l+Pk3zj5IVdRJ9VVkEozCKIRHMPGCh5rlA9NL/ERUuO6zfx vNiH6yQ3YpGQrPz7l1uLn5ofZcGGduDXttjEqGI232dwbPHiy6V088Tv/X27MN1zt0AcHX 1fmO+RkGLIMqaXPt5s2Jut8Vj0u01vZfUMdjMJ0L03g9lhjqxtsi/ZLwJuBhWrQdqNaLNy 7H6Xpr5dxceKUf3q1EL1kOSkdCdEddeDvDRAf1gYXNLzOX4ZeyDiN+cl+k1bqnoyt7Cxcw TGgYVuC2baJ9UyMYFhTYZs1k5Y1XYFunSaRzCAqZD9MWi2Rhs3scWPk6ufDQxw== 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=rZ8cFUQ3; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=CnrR3rb8; 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=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734716204; a=rsa-sha256; cv=none; b=VtA2TckX2YE5L5/oAckKbl6mJTYhSxINF0Thd6O51O6qf2Rezcn24j2s1IRDsI5qJE31UN L6DI0crXiZWCKTmJtpF3QAKoj5hgG6WIYNOU9b2s36+CVdPRhcgRKhvHB4R5gAamH8hXRX cU0ma+QgtQRZceSdQpsuKUy/1vWXz06oGcHJZHusWHpyI+e8vT1Orm3PLnvcJWkG2EicPV 2PmucYYhSaG5wSlESRarQlm0j2kgkgBNUrn63/f/+KWdSG5QS99HQUB/hsO0+b4BQDdZ4B ZlPK/SP9WyJP7QzBJdLJcipC4PNWWcFofmKL8JWSCKiqLL2QOZa1jANaur+tGA== 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 268307EFC for ; Fri, 20 Dec 2024 18:36:44 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOgv6-00070O-6l; Fri, 20 Dec 2024 12:36:12 -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 1tOguz-0006zP-65 for guix-patches@gnu.org; Fri, 20 Dec 2024 12:36:06 -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 1tOguy-00075a-3i for guix-patches@gnu.org; Fri, 20 Dec 2024 12: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:References:In-Reply-To:Date:From:To:Subject; bh=PXvJHN2kTOevePUdDaPlGt09v/c5ZE33yCY66SOmjr4=; b=rZ8cFUQ3s3WGwJi8aOCyFEV+eGU/gYr7Byy6UOL7rQmL9wWXPhTk+BB/tfsdPMxEmBnLD1hZIlWyMlrBR4XGXXmXmVdkOz+uVWQwhafMB7a9k72mm7KWEuKLrO7e/LonlrfDhQWv1NG3y3SOaEaVjGrvEGIoH3SiDuZ8PlAGvk50HWYlaw2Mo02Hf8Z7AZKb9bGaWVYP/8OouqoaEir76iIpqSok7kj2UQLomRiGUScseOnqwTkFkWdb9+8g/oD3fpb4qkq8OdoBVQPW4+EKMYYXnzgBTvWTFeLzJzdVbMmaLTK8W8m9RwAAiPyEOv6D4fPT//+t9J4q4XVZYSll+Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOgux-0004ns-5j; Fri, 20 Dec 2024 12:36:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74997] [PATCH 4/5] gnu: make-arm-trusted-firmware: Use downstream-package-name. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Fri, 20 Dec 2024 17:36:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74997 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74997@debbugs.gnu.org Cc: Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 74997-submit@debbugs.gnu.org id=B74997.173471615918432 (code B ref 74997); Fri, 20 Dec 2024 17:36:03 +0000 Received: (at 74997) by debbugs.gnu.org; 20 Dec 2024 17:35:59 +0000 Received: from localhost ([127.0.0.1]:43921 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) 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 ) 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) Date: Fri, 20 Dec 2024 18:35:04 +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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -2.44 X-Spam-Score: -2.44 X-Migadu-Queue-Id: 268307EFC X-TUID: hmk2hqSSwGZN * 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