mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-26 03:50:44 -09:00
Code Issues Packages Projects Releases Wiki Activity

boot/grub2: properly handle autoreconf for target package

Browse Source 
In commit e427f85e29 ("boot/grub2: fix
build issue since 2.14 version bump") we added some patches that
require regenerating the configure script. Consequently, we added
GRUB2_AUTORECONF = YES and HOST_GRUB2_AUTORECONF = YES.

Except that grub2 is special. While the host package is indeed using
host-autotols-package, the target package is using generic-package,
making GRUB2_AUTORECONF = YES basically a no-op.

Except that since we're patching configure.ac, the build realize at
build time that configure is older than configure.ac, regenerates it
at that time, and re-runs the configure script without the right
environment variables causing build failures.

We fix that by doing the autoreconf step "manually" for the target
grub2 package.

Fixes:

  https://autobuild.buildroot.org/results/11802ca1762e046328df324d33a1ad813fcd92e8/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Thomas Petazzoni
2026-08-10 23:29:17 +02:00
committed by Julien Olivain
parent a3a53b05f8
commit 19f9e2688f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
boot/grub2/grub2.mk
View File

@@ -17,8 +17,8 @@ GRUB2_INSTALL_IMAGES = YES
# 0001-Revert-configure-Check-linker-for-image-base-support.patch
# 0002-Revert-configure-Print-a-more-helpful-error-if-autoc.patch
GRUB2_AUTORECONF = YES
GRUB2_DEPENDENCIES += host-pkgconf
# Target grub2 package doesn't use autotools-package
GRUB2_DEPENDENCIES += host-automake host-autoconf host-libtool host-pkgconf
HOST_GRUB2_AUTORECONF = YES
HOST_GRUB2_DEPENDENCIES += host-pkgconf
@@ -139,6 +139,7 @@ HOST_GRUB2_CONF_OPTS = \
--disable-werror
define GRUB2_CONFIGURE_CMDS
cd $(@D); $(AUTORECONF)
$(foreach tuple, $(GRUB2_TUPLES-y), \
@$(call MESSAGE,Configuring $(tuple))
mkdir -p $(@D)/build-$(tuple)