From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id +G8fLfHkqGSssAAASxT56A (envelope-from ) for ; Sat, 08 Jul 2023 06:24:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 4EI8LfHkqGQiYAAA9RJhRA (envelope-from ) for ; Sat, 08 Jul 2023 06:24:17 +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 43DC85585A for ; Sat, 8 Jul 2023 06:24:17 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=jfZaL+hy; 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=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1688790257; 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=C4b6eEQ1rx9AQ2V6TQzTKN4NvOw9bb7XKALTB8tAca8=; b=IjSomJrkEO4p6ke3v2cIiAnle9j7J2HTN2GQ844nyq1jcOG3YMcAe9wfLOHGhWh9G4KttH IqdFJm6pgWfqnFEER74d/KfJ3qaCYQZLALTKyi82Jh/wLO6xxckWKTML+8kSp0/vcfHdHX EBv+B9TnnfHohZIIn3R+nHIViQ4ZBpxhVe7MVCu44MUGPA6dFvKNEFeipiyV69YaPqyF43 SFoVKTr8ueWJkJadfHjt5WZF/AwPWzNsOvmEi5/RHEX4ckusG4MDMdn6CPvlpUR7VwIVse qRBs7QtFFMRfQKoYNqVKMmz7JZy0Bx8+QqEhWxa8UNguptFW+iqxq+FF39nFPg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=jfZaL+hy; 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=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1688790257; a=rsa-sha256; cv=none; b=C6H2HvQ0Xtra3HpYC0KQ1g5sb+miR+Zu8P2u+0wa9mLHWsjw6bzhn4fj3hEzNO+uXFXRLf /idAOZND5yFEXMWIFlOityf9xjHrdjFngH4GIki5MDM7Pr/JTVNsbJG8tp0Q01UFn9oOEG v+yf3oOuhPb0xvQ/5FjEaJiuhAMDF9tI+HacR2eIIsF0XdAwD7hIlvqtMW9F7XP9A/MR0i J7A0VDA+R/iuzmgjuLdprH0ssX0f8tBEUoo26WFT7Sq9ONjXDg2cLPFKvif8ciFys7B5jE oxNElMi9i4AJoErEqaYpnhE6g2D+gwGdi28X2Qii8dms237E1t+wayHwPRzmmg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qHzUL-0005m9-47; Sat, 08 Jul 2023 00:24: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 1qHzUJ-0005lv-65 for guix-patches@gnu.org; Sat, 08 Jul 2023 00:24: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 1qHzUI-0003Ih-Du for guix-patches@gnu.org; Sat, 08 Jul 2023 00:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qHzUH-00014E-T2 for guix-patches@gnu.org; Sat, 08 Jul 2023 00:24:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64149] WIP update u-boot to 2023.07-rc4 Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 08 Jul 2023 04:24: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: Vagrant Cascadian Cc: 64149@debbugs.gnu.org, ludo@gnu.org, efraim@flashner.co.il Received: via spool by 64149-submit@debbugs.gnu.org id=B64149.16887902004045 (code B ref 64149); Sat, 08 Jul 2023 04:24:01 +0000 Received: (at 64149) by debbugs.gnu.org; 8 Jul 2023 04:23:20 +0000 Received: from localhost ([127.0.0.1]:44008 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qHzTb-00013A-6N for submit@debbugs.gnu.org; Sat, 08 Jul 2023 00:23:19 -0400 Received: from mail-qt1-f182.google.com ([209.85.160.182]:52445) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qHzTU-00012s-SZ for 64149@debbugs.gnu.org; Sat, 08 Jul 2023 00:23:16 -0400 Received: by mail-qt1-f182.google.com with SMTP id d75a77b69052e-40339ce8470so20872941cf.0 for <64149@debbugs.gnu.org>; Fri, 07 Jul 2023 21:23:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688790187; x=1691382187; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=C4b6eEQ1rx9AQ2V6TQzTKN4NvOw9bb7XKALTB8tAca8=; b=jfZaL+hy3FCIG6VWLdRM26HedigwcRwAXaViegB0YniOCK4+7zwxbKfNqfX/r7ZlOx wif+RPcM6ENIT9BQEzPuE18z+zVOhMfQyFBAxburibmoj664tcyMpU/8FTv0bkwX3VgE tfr/LJTxlSJGmzdXUT62L05TXB9cGWUH8C8Ne1h4sA2/mpUoSB8hjB8IEhKAIGOhGOLM qCrt+EdBGMFSVAgQVfe11FylzxqNUp/duUEvQhhW/CDoNbYvEq/IWm5ZRRHtppcYxIT/ UpKeHJEqYPZQjSq7zA2L9c8Efpy7+bAv7ZMJ/Yxkwx/B4BvlRb+gfqig0oO7nLgGzLYq T+sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688790187; x=1691382187; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=C4b6eEQ1rx9AQ2V6TQzTKN4NvOw9bb7XKALTB8tAca8=; b=GpPrJjviHL6xuF7Cz5XtjBjDql9qfv4SkO1PqhxEmsg+stTUqH4JxSYd6qeVH35/1j CnuenY84GwBw7toliyJD39+5fZcTxGTN9Be4OrElXzjhdnH1tFtlYHMFfF5ofa0JkBL7 Yc4Bs3vPigFMbsOGFeIpWZOdHWut3c7kwa8X/XgKNp9NAE+b7OPBJD3qaH+3PFGy0BZo OXtwGdKEPMBjdBb0uFL8OH3afO/4Cbji51l9BQgDyoNy8AXLAGKDrkvtITRZXK9h0abh 95YhpdGm3xThMW8zWHUJ0fQoMXrVz+d2TOwylE5WWdK5BlO/T6LzpHkq+XPWoDFyjaqw VmLA== X-Gm-Message-State: ABy/qLaTg90aZyIXpS0KCvbIhe/nDxFnRTK+ntAvllQMme7ARDdb0xfX p793WYnpUv3vi4hr8uJsTtMwdHi4lzQ= X-Google-Smtp-Source: APBJJlFl4sT4GmqDsxA6/tArlYa9HsiW6FrjLybpxawF/FI9PF5FAA8kV7nr2CJ8pX+Cll6AS87R/A== X-Received: by 2002:ac8:5c45:0:b0:3f6:c609:e9da with SMTP id j5-20020ac85c45000000b003f6c609e9damr8091612qtj.44.1688790187275; Fri, 07 Jul 2023 21:23:07 -0700 (PDT) Received: from hurd (dsl-205-236-230-179.b2b2c.ca. [205.236.230.179]) by smtp.gmail.com with ESMTPSA id d6-20020ac84e26000000b0040321ca109fsm2380572qtw.96.2023.07.07.21.23.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 21:23:06 -0700 (PDT) From: Maxim Cournoyer References: <87o7ld9mu8.fsf@wireframe> <87jzvhyecs.fsf@wireframe> <87wmzfwaep.fsf@wireframe> <87ttujw4cg.fsf@wireframe> <87r0pnw47b.fsf@wireframe> <87o7krvzq6.fsf@wireframe> Date: Sat, 08 Jul 2023 00:23:05 -0400 In-Reply-To: <87o7krvzq6.fsf@wireframe> (Vagrant Cascadian's message of "Tue, 04 Jul 2023 19:50:09 -0700") Message-ID: <87pm53xc9i.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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-Spam-Score: -0.67 X-Migadu-Queue-Id: 43DC85585A X-Migadu-Spam-Score: -0.67 X-Migadu-Scanner: mx0.migadu.com X-TUID: 6DTW70rh4T3J Hi Vagrant, Some quick comments: 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 ...) > Though, apparently I have the worst of both worlds, split across two > lines and not indented correctly! Easy enough to fix with the next > iteration... > > > I still think it is probably best to wait till the 2023.07 release to > actually push to master... but hopefully this resolves most of the > hardest work! Haha! I see you had the same comment yourself. > > live well, > vagrant > > 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". > * gnu/local.mk: Remove patches. Nitpick: I'd use "De-register" instead of remove. > * gnu/packages/patches/u-boot-allow-disabling-openssl.patch: Refresh. > * gnu/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch: Refresh. > * gnu/packages/bootloaders.scm (u-boot): Update to 2023.07-rc6. > [native-inputs]: Add python-pyelftools. > [source]: Remove patches. > (u-boot-tools)[phases]: Update substitution for python3-coverage. > Adjust 'patch to catch more openssl incompatibilities. > [native-inputs]: Add python-filelock and python-pytest-xdist. > (make-u-boot-sunxi64-package): Set SCP environment variable. > (u-boot-sifive-unleashed): Update to use opensbi. > (u-boot-puma-rk3399)[inputs]: Add arm-trusted-firmware-rk3399 to > package-inputs instead of native-inputs. > (u-boot-rockpro64-rk3399)[phases]: Add 'disable-spl-fit-signature. > --- > gnu/local.mk | 2 - > gnu/packages/bootloaders.scm | 46 +- > .../u-boot-allow-disabling-openssl.patch | 13 +- > .../patches/u-boot-infodocs-target.patch | 84 -- > .../u-boot-patman-guix-integration.patch | 1244 ----------------- > ...boot-sifive-prevent-reloc-initrd-fdt.patch | 8 +- > 6 files changed, 46 insertions(+), 1351 deletions(-) > delete mode 100644 gnu/packages/patches/u-boot-infodocs-target.patch > delete mode 100644 gnu/packages/patches/u-boot-patman-guix-integration.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index 6470f1abd4..fe46cd58f2 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1997,8 +1997,6 @@ dist_patch_DATA = \ > %D%/packages/patches/twinkle-bcg729.patch \ > %D%/packages/patches/u-boot-allow-disabling-openssl.patch \ > %D%/packages/patches/u-boot-fix-build-python-3.10.patch \ > - %D%/packages/patches/u-boot-infodocs-target.patch \ > - %D%/packages/patches/u-boot-patman-guix-integration.patch \ > %D%/packages/patches/u-boot-nintendo-nes-serial.patch \ > %D%/packages/patches/u-boot-rockchip-inno-usb.patch \ > %D%/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch \ > diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm > index a9685a9ef9..446dc8fc97 100644 > --- a/gnu/packages/bootloaders.scm > +++ b/gnu/packages/bootloaders.scm > @@ -648,23 +648,21 @@ (define %u-boot-rk3399-enable-emmc-phy-patch > (define u-boot > (package > (name "u-boot") > - (version "2022.10") > + (version "2023.07-rc6") > (source (origin > (patches > (list %u-boot-rockchip-inno-usb-patch > %u-boot-allow-disabling-openssl-patch > %u-boot-sifive-prevent-relocating-initrd-fdt > %u-boot-rk3399-enable-emmc-phy-patch > - (search-patch "u-boot-fix-build-python-3.10.patch") > - (search-patch "u-boot-infodocs-target.patch") > - (search-patch "u-boot-patman-guix-integration.patch"))) > + (search-patch "u-boot-fix-build-python-3.10.patch"))) > (method url-fetch) > (uri (string-append > "https://ftp.denx.de/pub/u-boot/" > "u-boot-" version ".tar.bz2")) > (sha256 > (base32 > - "1y5x8vxdgsqdqlsvq01mn8lmw53fqairkhvhhjx83hjva0m4id2h")))) > + "1dgvr228imbhzq7vzr8iialijl3k4mhjdirjrm6hsy6qbm6jyj5r")))) > (build-system gnu-build-system) > (native-inputs > (list bison > @@ -676,6 +674,7 @@ (define u-boot > perl > pkg-config ;for 'make menuconfig' > python > + python-pyelftools > swig > (list util-linux "lib"))) > (home-page "https://www.denx.de/wiki/U-Boot/") > @@ -726,7 +725,8 @@ (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 sdl2))) > (arguments > `(#:make-flags '("HOSTCC=gcc") > #:test-target "tcheck" > @@ -739,7 +739,7 @@ (define-public u-boot-tools > (("/bin/false") (which "false"))) > (substitute* "tools/dtoc/fdt_util.py" > (("'cc'") "'gcc'")) > - (substitute* "tools/patman/test_util.py" > + (substitute* "tools/u_boot_pylib/test_util.py" > ;; python3-coverage is simply called coverage in guix. > (("python3-coverage") "coverage") > > @@ -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" > ;; 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") > (setenv "BL31" (search-input-file inputs "bl31.bin")))))))) > (inputs > (modify-inputs (package-inputs base) > @@ -1104,7 +1109,7 @@ (define-public u-boot-puma-rk3399 > (delete 'strip) > (delete 'validate-runpath))))) > (inputs > - (modify-inputs (package-native-inputs base) > + (modify-inputs (package-inputs base) > (append arm-trusted-firmware-rk3399)))))) > > (define-public u-boot-qemu-arm > @@ -1170,7 +1175,20 @@ (define-public u-boot-sandbox > (append sdl2)))))) > > (define-public u-boot-sifive-unleashed > - (make-u-boot-package "sifive_unleashed" "riscv64-linux-gnu")) > + (let ((base (make-u-boot-package "sifive_unleashed" "riscv64-linux-gnu"))) > + (package > + (inherit base) > + (arguments > + (substitute-keyword-arguments (package-arguments base) > + ((#:phases phases) > + #~(modify-phases #$phases > + (add-after 'unpack 'set-environment > + (lambda* (#:key inputs #:allow-other-keys) > + (setenv "OPENSBI" (search-input-file inputs > + "fw_dynamic.bin")))))))) > + (inputs > + (modify-inputs (package-inputs base) > + (append opensbi-generic)))))) > > (define-public u-boot-sifive-unmatched > (let ((base (make-u-boot-package "sifive_unmatched" "riscv64-linux-gnu"))) > @@ -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? The rest LGTM, thank you! -- Maxim