mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-28 13:00:42 -09:00
e427f85e29
Since the bump of grub2 to version 2.14, the build fails on some
configurations with:
/home/autobuild/autobuild/instance-8/output-1/host/bin/grub-mkimage: error: `/home/autobuild/autobuild/instance-8/output-1/build/grub2-2.14/build-i386-pc/grub-core//kernel.img' is miscompiled: its start address is 0x9074 instead of 0x9000: ld.gold bug?.
We are not the only ones affected: OpenEmbedded has the issue as well,
addressed in commit
66aefeca48,
and this commit points that libreboot and Gentoo have also adopted the
same temporary fix: revert two upstream commits.
So to fix the issue in Buildroot, we take the same approach. It is
temporary, and there is an upstream patch series under discussion to
really fix the problem. But as this series has 9 patches still under
discussion, we take the simpler approach of reverting two simpler
patches for the time being.
host-pkgconf is needed as an additional dependency because
configure.ac using m4 macros provided by host-pkgconf.
Fixes:
https://autobuild.buildroot.net/results/89b/89b907278cada3d7ca1fee2d08d66921ffb4d7cc/build-end.log
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
From d0f516385dc73e8dd92b78ce08c1df100434fe67 Mon Sep 17 00:00:00 2001
|
|
From: Yi Zhao <yi.zhao@windriver.com>
|
|
Date: Fri, 27 Feb 2026 13:58:44 +0800
|
|
Subject: [PATCH] Revert "configure: Print a more helpful error if
|
|
autoconf-archive is not installed"
|
|
|
|
This reverts commit ac042f3f58d33ce9cd5ff61750f06da1a1d7b0eb.
|
|
|
|
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
|
Upstream: temporary revert, until upstream fixes the issue, see
|
|
discussion at
|
|
https://lists.gnu.org/archive/html/grub-devel/2026-02/msg00039.html
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
---
|
|
configure.ac | 5 -----
|
|
1 file changed, 5 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 041cfbab4..209c0fb11 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -1794,11 +1794,6 @@ LIBS=""
|
|
# Defined in acinclude.m4.
|
|
grub_ASM_USCORE
|
|
grub_PROG_TARGET_CC
|
|
-
|
|
-# The error message produced by autoconf if autoconf-archive is not installed is
|
|
-# quite misleading and not very helpful. So, try point people in the right direction.
|
|
-m4_ifndef([AX_CHECK_LINK_FLAG], [m4_fatal([autoconf-archive is missing. You must install it to generate the configure script.])])
|
|
-
|
|
if test "x$TARGET_APPLE_LINKER" != x1 ; then
|
|
grub_PROG_OBJCOPY_ABSOLUTE
|
|
fi
|
|
--
|
|
2.43.0
|
|
|