From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id gOCbNb4HsmTHaQEASxT56A (envelope-from ) for ; Sat, 15 Jul 2023 04:43:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id UOKcNb4HsmScqgAAauVa8A (envelope-from ) for ; Sat, 15 Jul 2023 04:43:10 +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 6DEE3589C6 for ; Sat, 15 Jul 2023 04:43:10 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=PhvHTY8A; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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=1689388990; a=rsa-sha256; cv=none; b=kr3nvb/6n33OdRBwePGOQRI3naog0WfUk9bc1ROY+f+wZtuKIaSkYPXi8gC9NosefXShgP IOrmFdDbTDCe+vFgYYf+hD6qP8FdX7G/QujnWc/oeJY2eL8IvOMZGVpUPOSyhWBOmYjPRb 48bmkxIq+mYsT0z9BnNbO5/yv007KUb6ILlCb5P6CAduzcSOiNL1mJuPFlU3tE7QQ2iPg3 P+TIKSKgYs118LmGLowgE7CY2S6o6SuKGZNEWUXjkgnN/bIF874o/SOehX5w+oonu3h44b OlfpTRIS7IhEY8RjhxFFHb2c8ICoLFxxkbg0snjr5RQpUAHvQNdNVU6Ngq5U5Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=PhvHTY8A; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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=1689388990; 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=zI16dQrVJnQS6WMkQMcYlR1LzXoQgHW8c5cGoJ0yny0=; b=oQgRCBYWXPcAnDJYV4zyTOZ8jwHTJH7DNRbYNZqJKdK1ODsmnyFKmKnGd8Qx3KsmLjvSox KtGmmDtgB8bwKwpx2DxolMZF98G1L3qMxg0iFc70U+DWkK31BFIAgwd2AVC5VEyYFqQk8u 2FYeumigUeseQSxYDZA8+rUr7KWejsJvHDufvLdpXf0lFPiM1SwTK/rVrF2PbVP6yNetZq jSOfqJyioAzxQtXP3sKO/OlzGhz66JzUmLAnhadf3A2wjazKKQecQt9Reg5FZY5E3kUEDo VElGUkS15y0TbzRJ1OcQ+hfkzHLlSdJkdBlv9HymkrmTrv2x9jE8hREJ5rKTOQ== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qKVFQ-0002ZG-EF; Fri, 14 Jul 2023 22:43:04 -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 1qKVFO-0002Z6-Tz for guix-patches@gnu.org; Fri, 14 Jul 2023 22:43:02 -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 1qKVFO-0007Lu-M3 for guix-patches@gnu.org; Fri, 14 Jul 2023 22:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qKVFO-00073c-2C for guix-patches@gnu.org; Fri, 14 Jul 2023 22:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64149] [PATCH v3 2/6] gnu: u-boot: Update to 2023.07.02. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Jul 2023 02:43: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: vagrant@debian.org Cc: 64149@debbugs.gnu.org, ludo@gnu.org, efraim@flashner.co.il Received: via spool by 64149-submit@debbugs.gnu.org id=B64149.168938895527082 (code B ref 64149); Sat, 15 Jul 2023 02:43:02 +0000 Received: (at 64149) by debbugs.gnu.org; 15 Jul 2023 02:42:35 +0000 Received: from localhost ([127.0.0.1]:43731 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKVEw-00072j-Da for submit@debbugs.gnu.org; Fri, 14 Jul 2023 22:42:35 -0400 Received: from mail-qk1-x729.google.com ([2607:f8b0:4864:20::729]:62607) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKVEt-00072V-HW for 64149@debbugs.gnu.org; Fri, 14 Jul 2023 22:42:32 -0400 Received: by mail-qk1-x729.google.com with SMTP id af79cd13be357-76758b855edso171219585a.0 for <64149@debbugs.gnu.org>; Fri, 14 Jul 2023 19:42:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689388945; x=1691980945; 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=zI16dQrVJnQS6WMkQMcYlR1LzXoQgHW8c5cGoJ0yny0=; b=PhvHTY8AbYwAnktQ9CZcP0lAQvWCFT1lp5H/1JqPvR0Zi+HASirVXylc8ipba5pERZ jUPBytMoiFxMJND1zeIMsUO7krdRO+fOZXGxpEDTW6s0hUi47tWWHMMHY4CAtE4nvHPQ UfLVk9EUdjo6zIftQctzni2TanP6DCIOYC4sReRArPnZo/WdkAFKAIAzANoAhOjjzkBL nPoFPFJ5Tw/JexeU1explilyl3s+eLlTC6/eW+UUP/Cw0lOP3X+RLntD4/4y3Gyi3xpY fWNdsTifLs0IeWG5Kf98dv7hPGLnkkdz0fC04JyhuR9j+aDju1NAeXRIOLoPCsiTgeYi 7inw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689388945; x=1691980945; 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=zI16dQrVJnQS6WMkQMcYlR1LzXoQgHW8c5cGoJ0yny0=; b=GKl3lfzITcSV6rCdaBPbNOt4Gc1c126sKb7/oAxpCg6BVY3GFqFra8fnxRikcCiAzv gMf4PHKHqOSf3tZMOALKY0lNk6NVGnQIKv0oyDbYGQDbS1OJm3WVMf3EukqrhpMAql+f VdOWx4zj67VuLCDw6TXWD890VLLTd0StEhmN/YIrKSlnG4poGUZ2SGMV9gIhAvtOJMvM OuoQEiEShkCFqh+5OK3XInaWrS79aN7RKGqe9IcZUGFqRdrJTtVi4S/OxlbiNzkm7Tmo WTR60uzyid9si9ZwpBN4US61SSOuCc7JN/IFWgX6Qs8gWbJIYrWfc9vfL9u3f/Ya/cgO WpIw== X-Gm-Message-State: ABy/qLajqp6Mgj0V8ycKW6l3DGyI/Va+qH+AAeNaMngGzmvU24bOCz06 m0zx2vYMGW2kqJ4EXfz0MjU= X-Google-Smtp-Source: APBJJlHpSUn4//7Gn4hjADwHjmf2L7rmc/ii015vR2s4P9KvdRZ1sy92HHbDejzpOa2WgFjIgMg1HA== X-Received: by 2002:a05:620a:2a16:b0:765:734b:1792 with SMTP id o22-20020a05620a2a1600b00765734b1792mr4768064qkp.23.1689388945532; Fri, 14 Jul 2023 19:42:25 -0700 (PDT) Received: from hurd (dsl-205-151-56-16.b2b2c.ca. [205.151.56.16]) by smtp.gmail.com with ESMTPSA id k23-20020a0cb257000000b00630228acc45sm4434257qve.145.2023.07.14.19.42.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jul 2023 19:42:25 -0700 (PDT) From: Maxim Cournoyer References: <874jm95gmz.fsf@wireframe> <20230712145206.298746-1-vagrant@debian.org> <20230712145206.298746-2-vagrant@debian.org> Date: Fri, 14 Jul 2023 22:42:23 -0400 In-Reply-To: <20230712145206.298746-2-vagrant@debian.org> (vagrant@debian.org's message of "Wed, 12 Jul 2023 07:52:02 -0700") Message-ID: <87a5vxx5dc.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-Migadu-Queue-Id: 6DEE3589C6 X-Migadu-Spam: Yes X-Spam: Yes X-Migadu-Scanner: mx1.migadu.com X-Migadu-Spam-Score: 7.59 X-Spam-Score: 7.59 X-TUID: 3ELKeb+CZHEz Hello, vagrant@debian.org writes: > From: Vagrant Cascadian > > * gnu/packages/patches/u-boot-infodocs-target.patch: Delete file. > * gnu/packages/patches/u-boot-patman-guix-integration.patch: Delete file. > * gnu/local.mk: De-register patches. > * 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.02. > [native-inputs]: Add python-pyelftools. > [source]: Remove patches. > (u-boot-tools)[phases]: Update substitution for python3-coverage. > Adjust 'patch to catch more openssl incompatibilities. > Split lines in 'patch phase. > [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 | 57 +- > .../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, 56 insertions(+), 1352 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 c817c9c926..0e0087b6aa 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1999,8 +1999,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 01fd1093ff..d1633b2b70 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.02") > (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")))) > + "1m91w3fpywllkwm000dqsw3294j0szs1lz6qbgwv1aql3ic4hskb")))) > (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,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. > + sdl2))) > (arguments > `(#:make-flags '("HOSTCC=gcc") > #:test-target "tcheck" > @@ -739,7 +743,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") > > @@ -777,7 +781,15 @@ (define-public u-boot-tools > ;; See https://bugs.gnu.org/34717 for > ;; details. > (("CONFIG_FIT_SIGNATURE=y") > - "CONFIG_FIT_SIGNATURE=n\nCONFIG_UT_LIB_ASN1=n\nCONFIG_TOOLS_LIBCRYPTO=n") > + "CONFIG_FIT_SIGNATURE=n > +CONFIG_UT_LIB_ASN1=n > +CONFIG_TOOLS_LIBCRYPTO=n") > + ;; Catch instances of implied CONFIG_FIG_SIGNATURE with VPL targets > + (("CONFIG_SANDBOX_VPL=y") > + "CONFIG_SANDBOX_VPL=y > +CONFIG_FIT_SIGNATURE=n > +CONFIG_VPL_FIT_SIGNATURE=n > +CONFIG_TOOLS_LIBCRYPTO=n") Thanks, this reads better. > ;; 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? > (setenv "BL31" (search-input-file inputs "bl31.bin")))))))) > (inputs > (modify-inputs (package-inputs base) > @@ -1104,7 +1118,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 +1184,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 +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. The rest LGTM. -- Thanks, Maxim