From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id iPM+JxrXqWSHzgAASxT56A (envelope-from ) for ; Sat, 08 Jul 2023 23:37:30 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id CPczJxrXqWToWwEA9RJhRA (envelope-from ) for ; Sat, 08 Jul 2023 23:37:30 +0200 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 D6B6B1F06E for ; Sat, 8 Jul 2023 23:37:29 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=R20DyLUV; dmarc=none; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1688852250; 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=5BWndG1k/ahS0/QW9B5bkdSkN+89EthK7akVVEj/cwc=; b=T1Z3VfiyG9iEc0GT1AqE997unIT/TkFqNK13fRhZqt3Om/kPpuF4R7OBNS1BZ7TTY/zfKZ x+GKI+jjJqCOr2FuLd/DOI9V89058uWsWfqo6kHlIz5fn0qOoFxWtw1r8r0WaoVn4IARUR uw4V145uezppDE/ssuKmnZxwXmlR6r2zJi1jIOSv/N96RQr9pyF/TpB4Qx/0TrB38xVLRy +tH1VbiV3LjPvPJvqHS9xxsne2nY6l57WBs1wG8W4f40c3ieGfmtEiVGQPFX+H23CZVOtY 4xcy4S9XYOx+zTgk/fOWsWDJzfswIO76PKGFup+3yfOoZOThmoq8LShPoNKkKw== 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=R20DyLUV; dmarc=none; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1688852250; a=rsa-sha256; cv=none; b=rk7xe7gVXNm5wfZRvO2sbpEjn7+6MPhVBgKsvX9L+OBYDT8nAcRjW7T8iz8EGBppXMmwiU pJMgabbLwsQfM9diwSs/CpTLkDNVTT6rVOxQqR1Hd1TzyjsMbUOpuCs2i8wuapzMN49wgw AtXKFgKHhl2dHHtdN2T9mwlzVkzMQCQtH7tywPKbTxOUuNoXfnKPyFIKBx57aKEdBe6TrR ABEiJoiz3G2+9E0YIwLtKsDZFW2NFXoDpQb4BzwTliZbKx/1MvNnLbl0nMVCZAjA7uuM3i veDTznkYXzzkWoQr4tK/E3rjQmntwjHFX32YrTiDgmTKXyuOFyULcxdVI26U/A== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qIFc0-00026L-Qu; Sat, 08 Jul 2023 17:37:05 -0400 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 1qIFby-00026C-Vx for guix-patches@gnu.org; Sat, 08 Jul 2023 17:37:03 -0400 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 1qIFby-0006t7-Oa for guix-patches@gnu.org; Sat, 08 Jul 2023 17:37:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qIFby-0007JH-Jy for guix-patches@gnu.org; Sat, 08 Jul 2023 17:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64149] WIP update u-boot to 2023.07-rc4 Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 08 Jul 2023 21:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64149 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Maxim Cournoyer Cc: 64149@debbugs.gnu.org, ludo@gnu.org, efraim@flashner.co.il Received: via spool by 64149-submit@debbugs.gnu.org id=B64149.168885221228075 (code B ref 64149); Sat, 08 Jul 2023 21:37:02 +0000 Received: (at 64149) by debbugs.gnu.org; 8 Jul 2023 21:36:52 +0000 Received: from localhost ([127.0.0.1]:45287 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qIFbn-0007Il-V8 for submit@debbugs.gnu.org; Sat, 08 Jul 2023 17:36:52 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:36252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qIFbl-0007IR-BN for 64149@debbugs.gnu.org; Sat, 08 Jul 2023 17:36:50 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id B31811ACE8; Sat, 8 Jul 2023 14:36:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1688852200; bh=uZovhdL2hZBdxDk8jL9jYvBC9WKChXGed98dX1kitF0=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=R20DyLUVbN6HlaG1uZ7c7bhXDB5Djp78SXkQNk7GNAGN2CVM1EqVphPuC8nxN8JUT Hs3ouxyS+NVcRc8xil6uyX86qCItJ87nHGr1Cmix2TMILG87Fnuv4nMy3UFOLGtQnG jaS/oHS8TnRewy3I3xlgx5dXN35dF0FFYmQy0m4YFhKKq/6VobgJUdeZJu7F6w6XVA gHZ6l5cZ6ROrRJWBpO6wTHWP8KmWDHoQ+qssUb4b5yeDJaUsURNDBpGRhZSWB8N2vm QeCegyuBB9R9dKo36Rbz0x4OSGxauZaFkASSQSsa6wwuVokIX0qe6gad8l3FC32+H6 ns2W6WEUDGuyg== From: Vagrant Cascadian In-Reply-To: <87pm53xc9i.fsf_-_@gmail.com> References: <87o7ld9mu8.fsf@wireframe> <87jzvhyecs.fsf@wireframe> <87wmzfwaep.fsf@wireframe> <87ttujw4cg.fsf@wireframe> <87r0pnw47b.fsf@wireframe> <87o7krvzq6.fsf@wireframe> <87pm53xc9i.fsf_-_@gmail.com> Date: Sat, 08 Jul 2023 14:36:34 -0700 Message-ID: <875y6ugk65.fsf@wireframe> 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 X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -3.98 X-Spam-Score: -3.98 X-Migadu-Queue-Id: D6B6B1F06E X-TUID: 5DUhD6ykU95l --=-=-= Content-Type: text/plain On 2023-07-08, Maxim Cournoyer wrote: > Vagrant Cascadian writes: > [...] >> The one thing I would probably prefer is to split this into one package >> per line, but I tried to aim for a smaller diff: >> >> - (prepend python-coverage python-pycryptodomex python-pytest sdl2))) >> + (prepend python-coverage python-filelock python-pycryptodomex >> +python-pytest python-pytest-xdist sdl2))) > > Odd indentation; please use something like: > > (prepend package1 > package2 > ...) Yup, that is the aproach I would propose for the next and/or final patch(es)! >> From d734cc541f920963e8cf8d68061d5329c9712d00 Mon Sep 17 00:00:00 2001 >> From: Vagrant Cascadian >> Date: Sun, 2 Jul 2023 18:20:39 -0700 >> Subject: [PATCH 2/2] gnu: u-boot: Update to 2023.07-rc6. >> >> * gnu/packages/patches/u-boot-infodocs-target.patch: Remove file. >> * gnu/packages/patches/u-boot-patman-guix-integration.patch: Remove >> file. > > Nitpick: I'd use "Delete" here instead of "Remove". Not my style, but not strongly opinionated either. :) >> * gnu/local.mk: Remove patches. > > Nitpick: I'd use "De-register" instead of remove. Even less my style, but also not strongly opinionated. :) >> @@ -778,6 +778,9 @@ (define-public u-boot-tools >> ;; details. >> (("CONFIG_FIT_SIGNATURE=y") >> "CONFIG_FIT_SIGNATURE=n\nCONFIG_UT_LIB_ASN1=n\nCONFIG_TOOLS_LIBCRYPTO=n") >> + ;; Catch instances of implied CONFIG_FIG_SIGNATURE with VPL targets >> + (("CONFIG_SANDBOX_VPL=y") >> + "CONFIG_SANDBOX_VPL=y\nCONFIG_FIT_SIGNATURE=n\nCONFIG_VPL_FIT_SIGNATURE=n\nCONFIG_TOOLS_LIBCRYPTO=n") > > I know it's already busted on the line above, but we can format this in > a more readable way by using something like: > "\ > CONFIG1=y > CONFIG2=n > ...\n" Will experiment with it, and if I can get it to work, also fix the CONFIG_FIT_SIGNATURE stuff too. >> ;; This test requires a sound system, which is un-used >> ;; in u-boot-tools. >> (("CONFIG_SOUND=y") "CONFIG_SOUND=n"))) >> @@ -1009,6 +1012,8 @@ (define*-public (make-u-boot-sunxi64-package board triplet >> #~(modify-phases #$phases >> (add-after 'unpack 'set-environment >> (lambda* (#:key native-inputs inputs #:allow-other-keys) >> + ;; Avoid dependency on crust-firmware https://issues.guix.gnu.org/48371 > > Trick to avoid busting the 80 characters per line limit: for links, you > can do (see: $link), which typically gets split like: > > ;; blablabla (see: > ;; https://...) > >> + (setenv "SCP" "/dev/null") Yeah, that sounds good... Although, now that "Add crust firmware for sunxi devices" (https://issues.guix.gnu.org/48371) finally got merged, we will have to fix this properly. :) >> @@ -1230,7 +1248,8 @@ (define-public u-boot-rockpro64-rk3399 >> "CONFIG_SATA_SIL=y" >> "CONFIG_SCSI=y" >> "CONFIG_SCSI_AHCI=y" >> - "CONFIG_DM_SCSI=y")))) >> + "CONFIG_DM_SCSI=y" >> + "# CONFIG_SPL_FIT_SIGNATURE is not set")))) >> (package >> (inherit base) >> (arguments >> @@ -1240,6 +1259,13 @@ (define-public u-boot-rockpro64-rk3399 >> (add-after 'unpack 'set-environment >> (lambda* (#:key inputs #:allow-other-keys) >> (setenv "BL31" (search-input-file inputs "/bl31.elf")))) >> + ;; Disable SPL FIT signatures, due to GPLv2 and Openssl license >> + ;; incompatibilities >> + (add-after 'unpack 'disable-spl-fit-signature >> + (lambda _ >> + (substitute* "configs/rockpro64-rk3399_defconfig" >> + (("CONFIG_SPL_FIT_SIGNATURE=y") >> + "# CONFIG_SPL_FIT_SIGNATURE is not set")))) > > Is this really needed, given we use "# CONFIG_SPL_FIT_SIGNATURE is not > set" in #:configs above? Only having it in #:configs resulted in a build failure (e.g. there were conflicting entries or something). Having it in both places seems better as it ensures it does not accidentally get enabled somehow. But we probably could drop the part in #:configs if we wanted ... or re-write how #:configs works, though that would be more than I want to get into right now! :) > The rest LGTM, thank you! Thanks for the review! Will try and incorporate the above suggestions and the patman patches and get another patch series ready for 2023.07-rc6, and then hopefully monday the actual release of 2023.07... live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZKnW4gAKCRDcUY/If5cW qnwZAP9gVa/dRVijnkmsr1nO1tKOSsNMus0ZMoBnaDFz/GKXHwD/RcM7kO9QOnsd TmwsPet/kKHS1jATgdnSipI3OO0dggs= =oEhj -----END PGP SIGNATURE----- --=-=-=--