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 WIxJCdVXuGMQkAAAbAwnHQ (envelope-from ) for ; Fri, 06 Jan 2023 18:18:13 +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 oPdQCNVXuGNJUQAAG6o9tA (envelope-from ) for ; Fri, 06 Jan 2023 18:18: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 8D8B62FBFC for ; Fri, 6 Jan 2023 18:18:12 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDqM1-0002L6-Vx; Fri, 06 Jan 2023 12:18:06 -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 1pDqLz-0002KV-A8 for guix-patches@gnu.org; Fri, 06 Jan 2023 12:18:03 -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 1pDqLy-0000Kh-On for guix-patches@gnu.org; Fri, 06 Jan 2023 12:18:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pDqLy-0005S1-9v for guix-patches@gnu.org; Fri, 06 Jan 2023 12:18:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v3 07/11] 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: Fri, 06 Jan 2023 17:18:02 +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, Maxim Cournoyer Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167302544720910 (code B ref 60224); Fri, 06 Jan 2023 17:18:02 +0000 Received: (at 60224) by debbugs.gnu.org; 6 Jan 2023 17:17:27 +0000 Received: from localhost ([127.0.0.1]:55742 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDqLP-0005RC-0X for submit@debbugs.gnu.org; Fri, 06 Jan 2023 12:17:27 -0500 Received: from cascadia.aikidev.net ([173.255.214.101]:33988) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDqLM-0005Qy-Vn for 60224@debbugs.gnu.org; Fri, 06 Jan 2023 12:17:25 -0500 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:40]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 335801AB39; Fri, 6 Jan 2023 09:17:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1673025437; bh=64ohncF1819vx3QFc1c6tksOY4Kc6L8EkvbPPstej3c=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=TOA3/BinjkcN2vmSc5Tc0UDFGkKD5Z/xCEUiUZZci6upSS0vDq4fFs/KNY8mhNM/0 oeX9KJjlphaXc+D6HzAvSajcuMq07rwC2FKXGoNTsMpZuTM8Bu76MwWSKh7WS7Q956 mVo9kWTs1MJkMDXzNOUjjLdOn0Oj8Ch/UpSN4iVhZbn0RIcKBCNKB0EZw6nf4cS2DQ AIRk6JvOv9GA8U0az2G19pShvpApK7VgZdamKKXm3NpkBsqBi+hMQUD+6LTaufXG6w GigIXcR/reijhl0ttlrjNavUwRcx2DW7uDI0V/UJjT61/CO49RE0Xl970BCIWt5mSV 1W0kkBROZlmiw== From: Vagrant Cascadian In-Reply-To: <20230102004637.3920-7-maxim.cournoyer@gmail.com> References: <20230102004637.3920-1-maxim.cournoyer@gmail.com> <20230102004637.3920-7-maxim.cournoyer@gmail.com> Date: Fri, 06 Jan 2023 09:17:12 -0800 Message-ID: <87k01zk2g7.fsf@yucca> 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=1673025492; a=rsa-sha256; cv=none; b=U4kplmsNyTTiepaNRF3FXkOfTDjyEvuni0HaBMZSPEEKidh2N+8UiBxnNkGBn8dtVVOba7 cKrLUf49SoXuYhaNopnm8A+fm85ZYBkpjSzPiTgRJi7lVoWuDu0gSGvS15YOzdByqBLLNE HkJPGlIO5gD1ehKBJDd+xzGhcPZ6vplKjSAo91zyRz1KDnu/OlDpRQhi7GBAj4IjyASm0o veJiey1eTxCDF3c6RfQegUbZ6tTv06MtJtAKQx9zvbeDYJVpEooJtd9eFrPIC37AsBxoAS 4kWDsBZr5KNO0CHCNbt2cp9czM51h+l7NZNIIoHahtxNrNZX33mgbdfZnz6oLg== 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="TOA3/Bin"; 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=1673025492; 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=J+pB9HW+6NogpmOr8oMwBcEDe0ykFOnsmrAMjOrf/jk=; b=C2fyV1/T9OyT4AfOz1VfckhZib5xbnnEDre6eZ3nX/orEAGZBPLw9fyl7u4OiwNBzUyMVe aA1vC8BRPAQkCixnlQenYlN2/kEMIs/fTsG8YC/GUHs4yjlQVqVcbk89npgtmy3xT8eGBI 0x85iChbmwZO89gqadZ8R7ksnR/pLr/u0wKY58VQg7zXiTX+iDNNtFrOT8aGR9N/TbJdLq d+YObfLD9GfTd8Cg6RYDgK/0shJiIz3H/t/6k0SpFNIGX4ncOQECOpm8Tpv2u+z7UO59CY 3eCTwYmfJLtotXoqP5JoHplO84GAq2FKyxbZMmFVV5KQCPVrqL8P/tu61fC0qA== X-Spam-Score: -2.96 X-Migadu-Queue-Id: 8D8B62FBFC Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b="TOA3/Bin"; 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-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -2.96 X-TUID: FAhx55cvnpkp --=-=-= Content-Type: text/plain On 2023-01-01, Maxim Cournoyer wrote: > * gnu/packages/bootloaders.scm (make-u-boot-sunxi64-package) > [phases] {set-environment}: Replace bl31.bin with bl31.elf; bl31.elf doesn't > exist anymore for some reason. Seems like the description is the inverse of what it is actually doing. But what it is doing is ... not right either. :/ This appears to repurpose a function targeted at sunxi64 platforms for rockchip platforms. Seems like you might want to make a make-u-boot-rockchip-package function instead? More details below... > gnu/packages/bootloaders.scm | 17 +++++++---------- > 1 file changed, 7 insertions(+), 10 deletions(-) > > diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm > index 8a56ee9cec..a19d1ebf17 100644 > --- a/gnu/packages/bootloaders.scm > +++ b/gnu/packages/bootloaders.scm > @@ -1005,17 +1005,14 @@ (define*-public (make-u-boot-sunxi64-package board 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)))))))) > + #~(modify-phases #$phases > + (add-after 'unpack 'set-environment > + (lambda* (#:key native-inputs inputs #:allow-other-keys) > + (setenv "BL31" (search-input-file (or native-inputs inputs) > + "bl31.elf")))))))) bl31.elf is built on rockchip platforms, but not sunxi/allwinner platforms. The sunxi/allwinner platforms need bl31.bin. > (native-inputs > - `(("firmware" ,arm-trusted-firmware-sun50i-a64) > - ,@(package-native-inputs base)))))) > + (modify-inputs (package-native-inputs base) > + (append arm-trusted-firmware-rk3399)))))) This is absolutely incorrect, as this forces it to be rk3399, which is not even a sunxi platform, and will break all the sun50i-a64 platforms (e.g. pine64, pinebook). That said, there are technically sunxi64 platforms that would use a different arm-trusted-firmware build, so this could use improving. live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCY7hXmQAKCRDcUY/If5cW qtkaAP91SxzfmPY/5ydhfgkR92XjYUosU3XxIMD08QaP7xmcgAD+L1SXPLb9HhEr o260mfwfz0XIeK/VDiLG6q51Y+0k0AQ= =MpCY -----END PGP SIGNATURE----- --=-=-=--