From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 uBIAJmles2SyRAAASxT56A (envelope-from ) for ; Sun, 16 Jul 2023 05:05:13 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id OI32JWles2QGUgEAauVa8A (envelope-from ) for ; Sun, 16 Jul 2023 05:05:13 +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 2889A58A53 for ; Sun, 16 Jul 2023 05:05:13 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=E237rDwL; 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=1689476713; a=rsa-sha256; cv=none; b=GBk2fFOEiLCLnHWXPa3O7qJCSt7FJsvgKm4ugx4zemnc+Zp2iT8NIqt4U/hfXOohloUGxS 5gYXBJDPHMnkn3rLnfiL6yYOLvvRrheuGaa/nMSk9E3NAIgpOxpxVVFUUzcsTiKfHc5OSr idiRj1HRJmZLnpWhYCXRvXjR9sE91CCIwD1/81hxUGIuISnOaHsNwzHxc8jI0XifDGq7yp V0+hc/MogQq1wXb7B58nrNyLoWB5y4r8Xi6iFWWn3SycjrN3Hq67JtMdwyLqnFa9OzG1SL qUBTfJC05ZXs1MuJGeidXf26V95w1Cv9SPJFRdTT1EWKaP8M1ZjjhHpIGpTmHQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=E237rDwL; 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=1689476713; 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=sO5alY5VNTFNQLi7R9nK3Z5ONmvqmbHrJxCnSAG8aKY=; b=HigpK2BYOx4z9FjxZAPqcZyMXpVVd5RYEyQhdl8IRiol4gEVn+nSAcgB3KUpfCOPcuk39S 9/o1T2Xb2zmQ2ROrFy/GLQtthw0dkiSoXLKh+fLF8dF6xTL6Tm6VuvSANdN/c581m/fmqz t4mkQTBmkcpDgU/2ao7+rKDuGec6ywwK8ptKzmKR/TTv5mlwTl5LTWyddXg3b0PWcvGYpv 4CefJWY8SvB2w5F+ZnWYTD2SCAle5IK2t9S7XphqCFmfuP1JxWJUSd7/7F5aQFP87g8xXV INrRPsEn1P9JcQ/rye9VE7MgAELIAEPsLBG+AP1SF0SVer/qbauh6p4sebFqZw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qKs4H-0007LA-6k; Sat, 15 Jul 2023 23:05: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 1qKs4F-0007JS-3e for guix-patches@gnu.org; Sat, 15 Jul 2023 23:05: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 1qKs4D-0001Kk-Ty for guix-patches@gnu.org; Sat, 15 Jul 2023 23:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qKs4D-0007f0-Ol for guix-patches@gnu.org; Sat, 15 Jul 2023 23:05: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: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Jul 2023 03:05: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.168947667929413 (code B ref 64149); Sun, 16 Jul 2023 03:05:01 +0000 Received: (at 64149) by debbugs.gnu.org; 16 Jul 2023 03:04:39 +0000 Received: from localhost ([127.0.0.1]:46301 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKs3q-0007eL-P8 for submit@debbugs.gnu.org; Sat, 15 Jul 2023 23:04:39 -0400 Received: from mail-qk1-x732.google.com ([2607:f8b0:4864:20::732]:47453) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKs3o-0007e7-DT for 64149@debbugs.gnu.org; Sat, 15 Jul 2023 23:04:37 -0400 Received: by mail-qk1-x732.google.com with SMTP id af79cd13be357-7680e39103bso97411485a.3 for <64149@debbugs.gnu.org>; Sat, 15 Jul 2023 20:04:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689476670; x=1692068670; 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=sO5alY5VNTFNQLi7R9nK3Z5ONmvqmbHrJxCnSAG8aKY=; b=E237rDwLf+pZft5r4YJ8exHREm1adpfOxtw/Nw5eDKJYxcobWjKlbwptStpZaGpyS+ yrp18JdFn2SPdp8Z4Mz9Hw3DbAvWBBbXkzv96SQwi69NeZMbUdOBBT39uBIfa/X5OKcn w7x3CpXuiD7oHX2nU+OPcy74ivPSxk3FlisK69LbIn60qFteDbOElRnayG1LLJUnVwv2 Ws4xvRLhDqFsvgmXiY+eCE1rXL/Ro1hudatkjBPXx9j4zh1jRLrV2IS8va434uQfMfeM RGbx22GkQiTPIHdjN7j8hOpEFz+rhFErzymrcoop0ZigKKQcOYS0vdy+AmbU6QYECTdR a1Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689476670; x=1692068670; 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=sO5alY5VNTFNQLi7R9nK3Z5ONmvqmbHrJxCnSAG8aKY=; b=gOhBPEIcK78k1QYiCiRVoc6eQIn9nyO3D6Fx2WBz7Dg3oKLNlV2Fwy3NV7yg4fmkdL V1MNja76+ZJt3y3L4iJaQEFktagSdLCWhbwZQcDYiKPXijuTJW7Kyv0M9dpd9zhP37wY NMXlC5J0KNIgoqVoDu2l3f4cm1IZQOSjIM/xHmBT39EHI4esrVio9kekD5Ts3Hb+7cId /nF1fWmbHUlW3MbG52nsti/380EP7uCX1hRUADZRZ02HR+s2PWZwfQipWuRBewi+J3rV /H2Vxo0SeUSKq1LT1K4Rdh7Drtuc5kBfQ2YDXuOuGrVXyv5brv5iwr9xu3umtC8V58lQ fCjw== X-Gm-Message-State: ABy/qLbmKzFVaaxiMv/YM3eGOVeWiN/Q6JxtBBHkY+hBQ9OoNJLYQfMK DrnDMGkEVx6bSmULtQm4W2c= X-Google-Smtp-Source: APBJJlEZkDHPrM/NqpKlnuxsmTWCceroSP03v4w03UldS+g2KouExAIwlPKD879l0uHK3T41ZvBF9g== X-Received: by 2002:a05:620a:2a02:b0:767:2919:f38f with SMTP id o2-20020a05620a2a0200b007672919f38fmr12000945qkp.10.1689476670400; Sat, 15 Jul 2023 20:04:30 -0700 (PDT) Received: from hurd (dsl-205-151-56-16.b2b2c.ca. [205.151.56.16]) by smtp.gmail.com with ESMTPSA id s18-20020a0cb312000000b00637790af432sm5365001qve.112.2023.07.15.20.04.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Jul 2023 20:04:29 -0700 (PDT) From: Maxim Cournoyer References: <874jm95gmz.fsf@wireframe> <20230712145206.298746-1-vagrant@debian.org> <20230712145206.298746-2-vagrant@debian.org> <87a5vxx5dc.fsf@gmail.com> <87sf9p3hge.fsf@wireframe> Date: Sat, 15 Jul 2023 23:04:28 -0400 In-Reply-To: <87sf9p3hge.fsf@wireframe> (Vagrant Cascadian's message of "Fri, 14 Jul 2023 21:51:45 -0700") Message-ID: <87fs5ov9oj.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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx0.migadu.com X-Migadu-Spam-Score: -5.04 X-Spam-Score: -5.04 X-Migadu-Queue-Id: 2889A58A53 X-TUID: 8923cqSqcgM3 Hi, Vagrant Cascadian writes: > 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... :) OK :-). > >>> ;; 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... Don't bother; it was a bit weird two things changed in the same series, but it keeps concerns a bit more separated, so it's fine as is. > >>> @@ -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. Hm. In my experience this means some other option is pulling in (by means of kconfig dependency resolution) the CONFIG_SPL_FIT_SIGNATURE option and would need to also be disabled. When faced with this problem I usually end up navigating the 'make menuconfig' kconfig interface and inspecting dependencies for the option at hand. -- Thanks, Maxim