Subject: Re: [PATCH core-updates v2 2/2] u-boot: Fix build under Python 3.10.

From: Maxim Cournoyer <[email-masked]>
Date: Tue, 21 Mar 2023 12:14:50 -0400

Hi Josselin,

Josselin Poiret <[email-masked]> writes:

> * gnu/packages/patches/u-boot-fix-build-python-3.10.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Register it.
> * gnu/packages/bootloaders.scm (u-boot): Apply patch.
> ---
>  gnu/local.mk                                  |  1 +
>  gnu/packages/bootloaders.scm                  |  3 ++
>  .../u-boot-fix-build-python-3.10.patch        | 35 +++++++++++++++++++
>  3 files changed, 39 insertions(+)
>  create mode 100644 gnu/packages/patches/u-boot-fix-build-python-3.10.patch
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index 058b23c683..73cf7b89a1 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -1936,6 +1936,7 @@ dist_patch_DATA =						\
>    %D%/packages/patches/tuxpaint-stamps-path.patch		\
>    %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		\
> diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
> index ac269807be..457f3b3994 100644
> --- a/gnu/packages/bootloaders.scm
> +++ b/gnu/packages/bootloaders.scm
> @@ -655,6 +655,9 @@ (define u-boot
>                       %u-boot-allow-disabling-openssl-patch
>                       %u-boot-sifive-prevent-relocating-initrd-fdt
>                       %u-boot-rk3399-enable-emmc-phy-patch
> +                     ;; FIXME The following patch is backported from 2023.01,
> +                     ;; remove when updating.

FIXME and other similar comment prefixes are more conventionally used
with a colon (FIXME: ...), I think.  I also prefer to keep the patch
origin tracking in the patch itself (and 'guix lint' checks for that
nowadays, at least in some cases).  The patch should fail to apply when
after it's included in a release.

Feel free to push with these suggested changes.

-- 
Thanks,
Maxim