From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id SKcyC0wmsmQbLwAASxT56A (envelope-from ) for ; Sat, 15 Jul 2023 06:53:32 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id OCiaCkwmsmRjbAEAG6o9tA (envelope-from ) for ; Sat, 15 Jul 2023 06:53:32 +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 C7D3152050 for ; Sat, 15 Jul 2023 06:53:30 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=VMExvwNS; 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=1689396811; a=rsa-sha256; cv=none; b=OZiDxHsKSNTV8RC5A4iMGww/HVgDJIiyJfNh5+rLaFrm3XOqw7XbwXddaOReFBMR2r7ewT ZKB3obWZZ9OPUhKqWUr39N5w7It/sJn12uGoyRDGtglo6q3gYiwWPx/Wplw/Aih2gnKUCP 68FBQAB/jP7BCasJZ5fw7By+nfqzT5t4Fa3IMzWiNv4S4GU10Ny3X3hTSYJLmogpl4dE7W EKuD0D+EAdjbnOQUocS0mk2/YP+R6wDFK3atBB83vbve2Nv6cUi66fyo6EwTS4iZ+Co/GD jtRwNWptxPNb/srLG5Jk4PKZdvk0v8sMfUAeao1czYH5Op8tfbTdKHyBcH9EJQ== 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=VMExvwNS; 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=1689396811; 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=q9dE7hLg4vMCdHaLmYeVLTHGcZLc0NzpM/OCfz49BXw=; b=J+U4TdxIrMyxm+BwqCQjlvCpnzqqBLjRVJF50899Txfc1VYbi/Ahbo2Eoazf4iAOFnSutn 9I/HD1L51G5O1NnoDdVO+lrGPwZRErIX3RgD9/p+230UUEfm3Aid9G68oaZl4tUQccMetQ ud4+ftglojHI0WACNuMRxsuxGhNRs36lMvit2fmoAzSwqnJnw3hRos0KzlR+bBg/LQJS8D aFdaZnJ20fzYPqYstJTve45wTSzLRKQzoTNDN1NLmZb2IIu0HcHDmb0ehPbIoZwK2JdKo6 /tWoNfzHWCQaVyB1NBkahD3ndHn4fI+AgjdKDLUu9cbf7SIsHkB3Wdrlbum7xg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qKXHJ-0007N8-NP; Sat, 15 Jul 2023 00:53:09 -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 1qKXHC-0007Mt-Qw for guix-patches@gnu.org; Sat, 15 Jul 2023 00:53:03 -0400 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 1qKXHC-0001Vm-2G for guix-patches@gnu.org; Sat, 15 Jul 2023 00:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qKXHB-0002AS-Ky for guix-patches@gnu.org; Sat, 15 Jul 2023 00:53:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64149] [PATCH v3 2/6] gnu: u-boot: Update to 2023.07.02. Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Jul 2023 04:53:01 +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.16893967258250 (code B ref 64149); Sat, 15 Jul 2023 04:53:01 +0000 Received: (at 64149) by debbugs.gnu.org; 15 Jul 2023 04:52:05 +0000 Received: from localhost ([127.0.0.1]:43793 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKXGH-000290-Dc for submit@debbugs.gnu.org; Sat, 15 Jul 2023 00:52:05 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:55452) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKXGD-00028R-Ne for 64149@debbugs.gnu.org; Sat, 15 Jul 2023 00:52:03 -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 40E621AD2C; Fri, 14 Jul 2023 21:51:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1689396711; bh=uUciT23+n+i1wwkxeaFcJObWANwaUACCi1fNjJFFoqE=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=VMExvwNSdjCfqQG3kqtu3ZKAbRpjb/azhlUP5BkoTh/ZuENFNZN8fS59ue4uwtfGu 77edPdT0OYxMo/sHbMtvloMtChvxO3R9ivhLwOuhWEw+HFwLs7upqRt1DXtbDauD5g qmVMiUBQ1VXq3b3Pc5W/HqNppD4uQTok3VKlfz8re3mZI/IdT4pGKtL142+LyrSLDD x+Ut9hvECDhWYV5qXSPWgiX2AdVZmg/B4g2f4OMrIRkjwzZ2mslQMEejcE+o40zsue zE4uw1SRu5Xw+ivVH1fsNpiRYVlSD44+TS1KpRDp14lGAvIAUigMzNIDwvpHa4pf0e D3K0HLzzgJMIw== From: Vagrant Cascadian In-Reply-To: <87a5vxx5dc.fsf@gmail.com> References: <874jm95gmz.fsf@wireframe> <20230712145206.298746-1-vagrant@debian.org> <20230712145206.298746-2-vagrant@debian.org> <87a5vxx5dc.fsf@gmail.com> Date: Fri, 14 Jul 2023 21:51:45 -0700 Message-ID: <87sf9p3hge.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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: 0.99 X-Migadu-Scanner: mx2.migadu.com X-Spam-Score: 0.99 X-Migadu-Queue-Id: C7D3152050 X-TUID: BfKkBFR5qZPz --=-=-= Content-Type: text/plain On 2023-07-14, Maxim Cournoyer wrote: > vagrant@debian.org writes: >> @@ -726,7 +725,12 @@ (define-public u-boot-tools >> (name "u-boot-tools") >> (native-inputs >> (modify-inputs (package-native-inputs u-boot) >> - (prepend python-coverage python-pycryptodomex python-pytest sdl2))) >> + (prepend python-coverage >> + python-filelock >> + python-pycryptodomex >> + python-pytest >> + python-pytest-xdist > > Maybe worth checking: Is pytest invoked with the '-n' (number->string > (parallel-job-count)); otherwise xdist doesn't provide any benefit. Whether it is actually used is or not is one thing... but as implemented, it fails to build without it... :) >> ;; This test requires a sound system, which is un-used >> ;; in u-boot-tools. >> (("CONFIG_SOUND=y") "CONFIG_SOUND=n"))) >> @@ -1009,6 +1021,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 >> + (setenv "SCP" "/dev/null") > > I think I've seen this gets added in a later commit. Any reason why it > can't be added here? Sure, the later commit coud be squashed into this one if desired. The initial patch was implemented before crust-firmware-* was merged, and so this initial workaround was necessary... >> @@ -1230,7 +1257,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 +1268,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")))) > > Are you sure this really disables SPL_FIT_SIGNATURE? The #:configs > arguments goes through 'verify-config', which ensures an unset value > doesn't get pulled as a dependency of other options, if I recall > correctly. Without this, it spits out a nasty error, I think because CONFIG_SPL_FIT_SIGNATURE is effectively defined multiple times (e.g. "=y" in the defconfig, and "# ... is not set" in the additional guix options?) and maybe verify-config fails in that situation? Sorry I don't have the error handy, but it was easy enough to trigger by dropping the 'disable-spl-fit-signature phase. live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZLIl4QAKCRDcUY/If5cW qrvAAP9DALJdH3YxAVHrtUqVTj9vR4ItSDJflV4i/YLZ61Tx3QEAnbpp3RzzrnpB BjrbgzLf3v2EXqxo+KO+n/3+ZOAtRwc= =4TDr -----END PGP SIGNATURE----- --=-=-=--