From d22f7f9633991daada5406160f6ac3d6ce0ee60b Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 19 Jan 2026 15:31:10 +0000 Subject: update grub to 2.14 This brings these extra changes: * eaa3b8f0f Bump version to 2.15 * d38d6a1a9 Release 2.14 * 35bfd6c47 build: Add grub-core/tests/crypto_cipher_mode_vectors.h file to EXTRA_DIST * ac042f3f5 configure: Print a more helpful error if autoconf-archive is not installed * e37d02158 kern/ieee1275/openfw: Add a check for invalid partition number * f94eae0f8 grub-mkimage: Do not generate empty SBAT metadata * 1aa0dd0c0 configure: Defer check for -mcmodel=large until PIC/PIE checks are done * ff1edd975 util/grub-mkimagexx: Stop generating unaligned appended signatures * 51ebc6f67 tests: Add functional tests for ecb/cbc helpers * caaf50b9a osdep/aros/hostdisk: Fix use-after-free bug during MsgPort deletion * 18f08826f kern/efi/sb: Enable loading GRUB_FILE_TYPE_CRYPTODISK_ENCRYPTION_KEY and GRUB_FILE_TYPE_CRYPTODISK_DETACHED_HEADER NOTE: This patch was reversed: * ac042f3f5 configure: Print a more helpful error if autoconf-archive is not installed Because it quite unhelpfully broke the build. Signed-off-by: Leah Rowe --- ...vert-configure-Check-linker-for-image-base-support.patch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'config/grub/nvme/patches/0010-Revert-configure-Check-linker-for-image-base-support.patch') diff --git a/config/grub/nvme/patches/0010-Revert-configure-Check-linker-for-image-base-support.patch b/config/grub/nvme/patches/0010-Revert-configure-Check-linker-for-image-base-support.patch index 6ec818ff..8e78e8b7 100644 --- a/config/grub/nvme/patches/0010-Revert-configure-Check-linker-for-image-base-support.patch +++ b/config/grub/nvme/patches/0010-Revert-configure-Check-linker-for-image-base-support.patch @@ -1,7 +1,8 @@ -From 70e4ffed2f1cd9b6871341260cae31a5e68c3081 Mon Sep 17 00:00:00 2001 +From 7b0d621389fc1857c918058f82093f9630ea7730 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Wed, 24 Dec 2025 01:42:17 +0100 -Subject: [PATCH 1/1] Revert "configure: Check linker for --image-base support" +Subject: [PATCH 10/10] Revert "configure: Check linker for --image-base + support" This reverts commit 1a5417f39a0ccefcdd5440f2a67f84d2d2e26960. --- @@ -26,7 +27,7 @@ index 70c1912f8..fa7840f09 100644 void cmain (void) diff --git a/configure.ac b/configure.ac -index a282bf7bf..17937baf4 100644 +index d8ca1b7c1..041cfbab4 100644 --- a/configure.ac +++ b/configure.ac @@ -1461,6 +1461,7 @@ elif test x$grub_cv_target_cc_link_format = x-mi386pe || test x$grub_cv_target_c @@ -45,9 +46,9 @@ index a282bf7bf..17937baf4 100644 TARGET_IMG_CFLAGS= fi -@@ -1793,18 +1795,6 @@ LIBS="" - grub_ASM_USCORE - grub_PROG_TARGET_CC +@@ -1798,18 +1800,6 @@ grub_PROG_TARGET_CC + 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 -AX_CHECK_LINK_FLAG([-Wl,--image-base,0x400000], - [TARGET_IMG_BASE_LDOPT="-Wl,--image-base"], -- cgit v1.2.1