From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id IGNcOfmFwGPYaQEAbAwnHQ (envelope-from ) for ; Thu, 12 Jan 2023 23:13:14 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id GF1/OPmFwGO5agEAG6o9tA (envelope-from ) for ; Thu, 12 Jan 2023 23:13:13 +0100 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 865E62AC96 for ; Thu, 12 Jan 2023 23:13:13 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pG5ol-0003Wo-QG; Thu, 12 Jan 2023 17:13:03 -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 1pG5ok-0003We-Fm for guix-patches@gnu.org; Thu, 12 Jan 2023 17:13:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pG5oj-0004WH-Ps for guix-patches@gnu.org; Thu, 12 Jan 2023 17:13:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pG5oj-0004C9-Kn for guix-patches@gnu.org; Thu, 12 Jan 2023 17:13:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v4 07/12] gnu: make-u-boot-sunxi64-package: Use gexps and adjust file name. Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 12 Jan 2023 22:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer , 60224@debbugs.gnu.org Cc: rekado@elephly.net Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167356154516080 (code B ref 60224); Thu, 12 Jan 2023 22:13:01 +0000 Received: (at 60224) by debbugs.gnu.org; 12 Jan 2023 22:12:25 +0000 Received: from localhost ([127.0.0.1]:48761 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pG5o9-0004BI-34 for submit@debbugs.gnu.org; Thu, 12 Jan 2023 17:12:25 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:52372) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pG5o6-0004B3-JS for 60224@debbugs.gnu.org; Thu, 12 Jan 2023 17:12:23 -0500 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 61CF01AB7D; Thu, 12 Jan 2023 14:12:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1673561536; bh=0VTxDMsix1gP52h+YaC9YIV/sjsjTBpSqz0+ZxaYLSU=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=VjnmO8eg4/wQd3BZ0YVMapagJB0rCYZHAgzmLVtL10OQjypAgn7hGxyiJhBS7k2Mt 0Cq4JGPPNvT+RPYIXSX+YckoobpfjCBqiEZt3WdWRy6xC1dT4G2xpeZPjYAboLlmzl RAsr6tb/B1/elZ2kOCHciiksdfDUcSKlttqNLTf+q0CVhLP3vnr/2z/0cKqhVaffYF XLE9LVsSYpJrx3XRakiPUSD9vEIX8WrrPatyOy5o5TDERQmYsorYwNBpkd+gwzzf8v 7eJucSenCTAuYqumv+ddKiYJIvbbmoA3qPcx43srz4fCm8fasPF21GMrj6I4npX8r6 eqiJloIQhA1fA== From: Vagrant Cascadian In-Reply-To: <20230111204433.15305-7-maxim.cournoyer@gmail.com> References: <20230111204433.15305-1-maxim.cournoyer@gmail.com> <20230111204433.15305-7-maxim.cournoyer@gmail.com> Date: Thu, 12 Jan 2023 14:12:12 -0800 Message-ID: <87tu0v7683.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-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1673561593; a=rsa-sha256; cv=none; b=pXNV4KBLd56yiaVlpoVJtFSBAsOcAeYF6KYKq3odeBjiYUnfoRvaF/OfsFo7gck+TG86Cn ArNCho8EMjG7gRialoKsxcvYKORYNqs3gH5tmvfe4yXIxeOlUL/UxCZk6pvdxGEFL8R0lp XvssxGBlWq+ilG0PNoe2QOTXL1ybpdAjR0rCirFWRGh9SedM+ECySAYSoe7Koccn2hkf7U uXhv2wo2Oz2WT462Y0NW8Vl44gncrrWlaq+Wf3pSeK+pxtFOZpjO7UBqfG8Ji/N2O8TeWe PwnGfb/WfIaKEs0U2MQoeuma0fI6tnqqBsjw1nVO7Czf9na36nr2GilGbBwT1w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=VjnmO8eg; 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=1673561593; 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=uj1BzSEhuccYDxe7RGDnIekOiQb4MbSKz0ybVAWzfAI=; b=ZJx0UL0v/1Dn/3IRBCti0/YvKKqR1kejc83ktvhsFTvuIzywdRcpr+kDDAaHnzU6ftDiqP 7JXF3iyzn8NxgcBvL/hQcM+GpnCG0hSPqEYGvOnR2TqBPKOjCWMBQOV3WyohphrCG3UiRX u+rO4g5PxYHVuEvmr0ruKDkCKzF2E3xMAOxhtvwCqnL4b/PP3BIut5ASD4o9X7rjIh1wdl 3kY4n7eB9kla82k1gs7ERGM+J6O8bJCbgIaWMwus20JzByKT+qQz48BRDWF7FV0oc3hd98 RJYX1e4Ppxc/U4wv2HRhU2GkLrrKT78oEvBAKN8+3zy/CEKLQRnnDWZdz49CUw== X-Migadu-Spam-Score: -1.70 X-Spam-Score: -1.70 X-Migadu-Queue-Id: 865E62AC96 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=VjnmO8eg; 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 X-TUID: j5yjJZeqPM/j --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On 2023-01-11, Maxim Cournoyer wrote: > * gnu/packages/bootloaders.scm (make-u-boot-sunxi64-package) > [phases] {set-environment}: Replace bl31.bin with bl31.elf; bl31.elf does= n't > exist anymore for some reason. The code no longer mentions bl31.elf, but the commit comment still does! > [native-inputs]: Turn into... > [inputs]: ... this. > > --- > > Changes in v4: > - Revert erroneously replaced firmware package > - Revert bl31.bin -> bl31.elf change caused by the above > - Make the arm-trusted-firmware-sun50i-a64 a host input So fix the commit comment to reflect that... > gnu/packages/bootloaders.scm | 18 +++++++----------- > 1 file changed, 7 insertions(+), 11 deletions(-) > > diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm > index 87d5bcb824..0c5205fa86 100644 > --- a/gnu/packages/bootloaders.scm > +++ b/gnu/packages/bootloaders.scm > @@ -1010,17 +1010,13 @@ (define*-public (make-u-boot-sunxi64-package boar= d triplet > (arguments > (substitute-keyword-arguments (package-arguments base) > ((#:phases phases) > - `(modify-phases ,phases > - (add-after 'unpack 'set-environment > - (lambda* (#:key native-inputs inputs #:allow-other-keys) > - (let ((bl31 > - (string-append > - (assoc-ref (or native-inputs inputs) "firmware") > - "/bl31.bin"))) > - (setenv "BL31" bl31)))))))) > - (native-inputs > - `(("firmware" ,arm-trusted-firmware-sun50i-a64) > - ,@(package-native-inputs base)))))) > + #~(modify-phases #$phases > + (add-after 'unpack 'set-environment > + (lambda* (#:key native-inputs inputs #:allow-other-keys) > + (setenv "BL31" (search-input-file inputs "bl31.bin")))= ))))) > + (inputs > + (modify-inputs (package-inputs base) > + (append arm-trusted-firmware-sun50i-a64)))))) >=20=20 > (define-public u-boot-pine64-plus > (make-u-boot-sunxi64-package "pine64_plus" "aarch64-linux-gnu")) > --=20 > 2.38.1 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCY8CFvAAKCRDcUY/If5cW qjsIAQCzceVg54TqcPCMuIUYQyhHQ21NkajdBa32N+EcSUzaWgD+Im8Snkih8c5a a6O2VmJBZXwWWQ073J11If5psJqJ7AU= =dEEF -----END PGP SIGNATURE----- --=-=-=--