all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Vagrant Cascadian <vagrant@debian.org>
To: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Cc: 64149@debbugs.gnu.org, ludo@gnu.org, efraim@flashner.co.il
Subject: [bug#64149] [PATCH v3 2/6] gnu: u-boot: Update to 2023.07.02.
Date: Fri, 14 Jul 2023 21:51:45 -0700	[thread overview]
Message-ID: <87sf9p3hge.fsf@wireframe> (raw)
In-Reply-To: <87a5vxx5dc.fsf@gmail.com>

[-- Attachment #1: Type: text/plain, Size: 3513 bytes --]

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

  reply	other threads:[~2023-07-15  4:53 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-18  8:49 [bug#64149] WIP update u-boot to 2023.07-rc4 Vagrant Cascadian
2023-07-03  1:26 ` [bug#64149] WIP update u-boot to 2023.07-rc5 Vagrant Cascadian
2023-07-04 22:59   ` Vagrant Cascadian
2023-07-05  1:10     ` Vagrant Cascadian
2023-07-05  1:13       ` Vagrant Cascadian
2023-07-05  2:50         ` [bug#64149] WIP update u-boot to 2023.07-rc6 Vagrant Cascadian
2023-07-06 17:50           ` Vagrant Cascadian
2023-07-08  4:03             ` [bug#64149] [PATCH 0/2] Maxim Cournoyer
2023-07-08  4:03             ` [bug#64149] [PATCH 1/2] gnu: Add python-u-boot-pylib Maxim Cournoyer
2023-07-08  4:03             ` [bug#64149] [PATCH 2/2] gnu: patman: Add python-u-boot-pylib to inputs Maxim Cournoyer
2023-07-08 23:21               ` Vagrant Cascadian
2023-07-09  2:36                 ` Vagrant Cascadian
2023-07-10  4:01                 ` Maxim Cournoyer
2023-07-08  4:23           ` [bug#64149] WIP update u-boot to 2023.07-rc4 Maxim Cournoyer
2023-07-08 21:36             ` Vagrant Cascadian
2023-07-09  1:38               ` [bug#64149] [PATCH v2] bug#64149: WIP update u-boot to 2023.07-rc6 Vagrant Cascadian
2023-07-09  1:47                 ` [bug#64149] [PATCH 1/5] gnu: arm-trusted-firmware: Update to 2.9 vagrant
2023-07-09  1:47                   ` [bug#64149] [PATCH 2/5] gnu: u-boot: Update to 2023.07-rc6 vagrant
2023-07-10 19:35                     ` Vagrant Cascadian
2023-07-09  1:47                   ` [bug#64149] [PATCH 3/5] gnu: u-boot: Add crust firmware to pinebook, pine64_plus and pine64-lts vagrant
2023-07-09  1:47                   ` [bug#64149] [PATCH 4/5] gnu: Add python-u-boot-pylib vagrant
2023-07-09  1:47                   ` [bug#64149] [PATCH 5/5] gnu: patman: Add python-u-boot-pylib to inputs vagrant
2023-07-10 19:39                     ` Vagrant Cascadian
2023-07-12 14:49 ` [bug#64149] [PATCH v3 0/6] Update u-boot to 2023.07.02 Vagrant Cascadian
2023-07-12 14:52   ` [bug#64149] [PATCH v3 1/6] gnu: arm-trusted-firmware: Update to 2.9 vagrant
2023-07-12 14:52     ` [bug#64149] [PATCH v3 2/6] gnu: u-boot: Update to 2023.07.02 vagrant
2023-07-15  2:42       ` Maxim Cournoyer
2023-07-15  4:51         ` Vagrant Cascadian [this message]
2023-07-16  3:04           ` Maxim Cournoyer
2023-07-16  4:04             ` Vagrant Cascadian
2023-07-12 14:52     ` [bug#64149] [PATCH v3 3/6] gnu: u-boot: Add crust firmware to pinebook, pine64_plus and pine64-lts vagrant
2023-07-15  2:46       ` Maxim Cournoyer
2023-07-12 14:52     ` [bug#64149] [PATCH v3 4/6] gnu: Add python-u-boot-pylib vagrant
2023-07-12 14:52     ` [bug#64149] [PATCH v3 5/6] gnu: patman: Add python-u-boot-pylib to inputs vagrant
2023-07-12 14:52     ` [bug#64149] [PATCH v3 6/6] (patman)[phases]: Remove 'sanity-check vagrant
2023-07-15  2:51       ` Maxim Cournoyer
2023-07-15  2:31     ` [bug#64149] [PATCH v3 1/6] gnu: arm-trusted-firmware: Update to 2.9 Maxim Cournoyer
2023-07-13 13:52   ` [bug#64149] Update u-boot to 2023.07.02 Vagrant Cascadian
2023-07-20  1:44 ` [bug#64149] [PATCH v4 0/5] Update U-boot " vagrant
2023-07-20  1:44   ` [bug#64149] [PATCH v4 1/5] gnu: arm-trusted-firmware: Update to 2.9 vagrant
2023-07-20  1:44   ` [bug#64149] [PATCH v4 2/5] gnu: u-boot: Update to 2023.07.02 vagrant
2023-07-20  1:44   ` [bug#64149] [PATCH v4 3/5] gnu: u-boot: Add crust firmware to pinebook, pine64_plus and pine64-lts vagrant
2023-07-20  1:44   ` [bug#64149] [PATCH v4 4/5] gnu: Add python-u-boot-pylib vagrant
2023-07-20  1:44   ` [bug#64149] [PATCH v4 5/5] gnu: patman: Add python-u-boot-pylib to inputs vagrant
2023-07-20  3:37   ` [bug#64149] [PATCH v4 0/5] Update U-boot to 2023.07.02 Maxim Cournoyer
2023-07-20  6:01     ` bug#64142: Update U-boot to 2023.07.02, arm-trusted-firmware to 2.9 Vagrant Cascadian

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87sf9p3hge.fsf@wireframe \
    --to=vagrant@debian.org \
    --cc=64149@debbugs.gnu.org \
    --cc=efraim@flashner.co.il \
    --cc=ludo@gnu.org \
    --cc=maxim.cournoyer@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.