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 cGONFwgQqmTi/AAASxT56A (envelope-from ) for ; Sun, 09 Jul 2023 03:40:24 +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 SNbxFwgQqmS3cgEA9RJhRA (envelope-from ) for ; Sun, 09 Jul 2023 03:40:24 +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 AB3ED21F2B for ; Sun, 9 Jul 2023 03:40:23 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=mNh05A38; 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=1688866824; a=rsa-sha256; cv=none; b=MH3x9iFrMnUoLotViiTe51kapo/SY9P09Ee9szq3R76JgR5I/a7y2g7HEn227vKHXRjnd3 Z6DrOVO/Uxe+9CcbcnyAvDTRRTUtrAygN5s1HtM2nvob+RwdCbc58GfeJDFEr/YFdcWFFr gKX0carCzp4gCqrVJ+2G5/eDPIBmgPs7phmTnzaG4mBej5R4UuVwjjJwHrJmIxorhMuzd+ SzmWLBIP5GBqi8Rown6y0mtnfyjo4l3/kk1KXZaCuy3yFBI7wBJNpqx4Ga19oFu1d5YOcd 05btKANJzBCHPnc1j2dmi3d0WRfiCC8FVV8F99AW0DmkW8PeNMtbc2v7QC0I6w== 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=mNh05A38; 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=1688866824; 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=fo7wYTVy4zuNZtM7FUgTctfVN9aVOJB0t3nEwxc6YCs=; b=FLxcOs2ObuPUuwYnj/ixocCsp+jOo0AW7iCJYTe7wfkltCWFPkVHFIWEJzqJnS1O4xLVmr ploTMV1VHWg7SCd/vwagnjk5lwjHi64ok/ieuxJLZT+QQwcilnqZAe2lqZlbAQ4RkrMUvS baOCcCeJl5dYIm/8Ai+GzG/QVK2Y/ONJDWxiJmICFiRQEx2noRAGeqvKZ0Ec9bumPW/Y+U aez7guEz7JRWiz83ipN4kbgj+5C/xv7ODzA1bkI7FO+xoT18VDmC2cIdBuW529gvO+qnNO zLDbrDaU+e/M/ptngQzbuqByemJXQQD6vZlbGPTUNuqcmStWY4Eq1ZcI2+lczw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qIJPJ-0006Vj-Ve; Sat, 08 Jul 2023 21:40:14 -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 1qIJP9-0006V5-GI for guix-patches@gnu.org; Sat, 08 Jul 2023 21:40:04 -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 1qIJP9-0007vG-2y for guix-patches@gnu.org; Sat, 08 Jul 2023 21:40:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qIJP8-0007lq-FI for guix-patches@gnu.org; Sat, 08 Jul 2023 21:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64149] [PATCH v2] bug#64149: WIP update u-boot to 2023.07-rc6 Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Jul 2023 01:40: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.168886675629751 (code B ref 64149); Sun, 09 Jul 2023 01:40:02 +0000 Received: (at 64149) by debbugs.gnu.org; 9 Jul 2023 01:39:16 +0000 Received: from localhost ([127.0.0.1]:45373 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qIJON-0007jk-9K for submit@debbugs.gnu.org; Sat, 08 Jul 2023 21:39:15 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:51084) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qIJOL-0007jY-H7 for 64149@debbugs.gnu.org; Sat, 08 Jul 2023 21:39:14 -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 D2C741ACE8; Sat, 8 Jul 2023 18:39:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1688866745; bh=Gr6iklE15t2Bh6DLloh2HcIJPYKE1dGaazdioOS79WQ=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=mNh05A38vhwOSlupjVa5mu3JrlSENJ5c5lQBVhAcqfQ2o1rkE/sWJDtE8v/rtUm1O zx5agzX59M0gPFGYbvkIkeuVSuc1CqcBTrE0cAu7c1Mr22ZlX+lQFIjxWWdDJpqtn6 38CU3wbM6HGp71jFumMliZIyYxTOj8WuGdjm33tc9hJCcR9VMN+rTsJP16YBfwU9l6 Q8xhYlUzcDxUrB/jjbBPc4u93fxdjx8IaJEhXaLiRZgjH3ZHYz+0uIWIZN9ElTURXG 68MTxG6GRqpVCjs3rC/5dTqdhiM7gjVQZq52U/JFzXwlOU+XWn4gn6M+HsWn0cS2WH m/zc147R8+vpA== From: Vagrant Cascadian In-Reply-To: <875y6ugk65.fsf@wireframe> References: <87o7ld9mu8.fsf@wireframe> <87jzvhyecs.fsf@wireframe> <87wmzfwaep.fsf@wireframe> <87ttujw4cg.fsf@wireframe> <87r0pnw47b.fsf@wireframe> <87o7krvzq6.fsf@wireframe> <87pm53xc9i.fsf_-_@gmail.com> <875y6ugk65.fsf@wireframe> Date: Sat, 08 Jul 2023 18:38:47 -0700 Message-ID: <87zg45g8yg.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: scn1.migadu.com X-Migadu-Spam-Score: -2.38 X-Migadu-Queue-Id: AB3ED21F2B X-Spam-Score: -2.38 X-TUID: h3enMxXZ5sk7 --=-=-= Content-Type: text/plain On 2023-07-08, Vagrant Cascadian wrote: > 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)! Included in the upcoming patch series. >>> * 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. :) And also included. >>> @@ -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" I did something somewhat like that, in a way that did not require using \n at all, for both the CONFIG_FIT_SIGNATURE and CONFIG_SANDBOX_VPL lines. >>> @@ -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... Oops, forgot that... because... > 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. :) I made this work. :) >>> @@ -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! :) I stuck with the above rationale and left it as it was... I've included the patch updating arm-trusted-firmware to 2.9 from https://issues.guix.gnu.org/64142 and the patches submitted regarding patman, although as mentioned patman still needs some updates. live well, vagrant --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZKoPpwAKCRDcUY/If5cW qkm9AQDKwc14rPZ+5vQWYiUweURaP5AOwr/qINsaxVbZjqL/2AEAs7b/FJoZvEdb qUHA4U4psaH0frNJSnYgW60zteesXAM= =UoPU -----END PGP SIGNATURE----- --=-=-=--