Re: [Buildroot] [PATCH v2] boot/grub2: fix build race condition

["Yann E. MORIN" <yann.morin.1998@free.fr>]

Stefan, All,

On 2022-08-05 09:12 +0200, Stefan Agner spake thusly:
> Sometimes buildroot fails with:
> ../grub-core/kern/emu/hostfs.c:20:10: fatal error: config-util.h: No such file or directory
>    20 | #include <config-util.h>
>       |          ^~~~~~~~~~~~~~~
> 
> Add a patch which fixes the Makefile to correctly generate config-util.h
> first.
> 
> Note: This readds a work around to avoid re-running autoconf. This has
> previously been used to avoid having to run the rather complex build
> file generation machinery of GRUB2. See 7e64a050fb ("boot/grub2: Fix
> GRUB i386-pc build with Ubuntu gcc").

7e64a050fb also touched Makefile.util.am, so I had to check that this
was no onger needed, so I extended the commit log that touching
Makefile.in is indeed sufficient.

> Signed-off-by: Stefan Agner <stefan@agner.ch>
> ---
[--SNIP--]
> diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk
> index 57593330dd..6c9c80dc15 100644
> --- a/boot/grub2/grub2.mk
> +++ b/boot/grub2/grub2.mk
> @@ -13,6 +13,12 @@ GRUB2_DEPENDENCIES = host-bison host-flex host-grub2
>  HOST_GRUB2_DEPENDENCIES = host-bison host-flex
>  GRUB2_INSTALL_IMAGES = YES
>  
> +define GRUB2_AVOID_AUTORECONF

We usually add a comment to refer to the patch that requires such a
hook, so I added one.

> +       $(Q)touch $(@D)/Makefile.in

    $ make check-package
    boot/grub2/grub2.mk:18: expected indent with tabs

I fixed that too, and applied to master, thanks.

Regards,
Yann E. MORIN.

> +endef
> +GRUB2_POST_PATCH_HOOKS += GRUB2_AVOID_AUTORECONF
> +HOST_GRUB2_POST_PATCH_HOOKS += GRUB2_AVOID_AUTORECONF
> +
>  # CVE-2019-14865 is about a flaw in the grub2-set-bootflag tool, which
>  # doesn't exist upstream, but is added by the Redhat/Fedora
>  # packaging. Not applicable to Buildroot.
> -- 
> 2.37.1
> 

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot