mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-07-22 05:00:08 +02:00
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 <leah@libreboot.org>
This commit is contained in:
+2
-2
@@ -1,7 +1,7 @@
|
||||
From 248018d7623fa1dc0e1b4ef3a430eac04cbe51bf Mon Sep 17 00:00:00 2001
|
||||
From 2c953c9160cbed357437891cf1790aeb1c2bd0f5 Mon Sep 17 00:00:00 2001
|
||||
From: Leah Rowe <leah@libreboot.org>
|
||||
Date: Sun, 31 Oct 2021 03:47:05 +0000
|
||||
Subject: [PATCH 1/9] mitigate grub's missing characters for borders/arrow
|
||||
Subject: [PATCH 01/10] mitigate grub's missing characters for borders/arrow
|
||||
characters
|
||||
|
||||
This cleans up the display on the main screen in GRUB.
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
From d029792781fe280b8dac1bed457ef78b2af84ee2 Mon Sep 17 00:00:00 2001
|
||||
From 71623385f90580b2138110cf00ee66b7a05abcf6 Mon Sep 17 00:00:00 2001
|
||||
From: Leah Rowe <leah@libreboot.org>
|
||||
Date: Sat, 19 Nov 2022 16:30:24 +0000
|
||||
Subject: [PATCH 2/9] say the name libreboot, in the grub menu
|
||||
Subject: [PATCH 02/10] say the name libreboot, in the grub menu
|
||||
|
||||
---
|
||||
grub-core/normal/main.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
|
||||
index de9a3f961..1fabb9c86 100644
|
||||
index de9a3f961..bed502cde 100644
|
||||
--- a/grub-core/normal/main.c
|
||||
+++ b/grub-core/normal/main.c
|
||||
@@ -215,7 +215,7 @@ grub_normal_init_page (struct grub_term_output *term,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From b42452eca17efb562e1ffe809ff8d3bdbbda3728 Mon Sep 17 00:00:00 2001
|
||||
From a21c5e997d6247d713717745b5f7bd380b98fce1 Mon Sep 17 00:00:00 2001
|
||||
From: Leah Rowe <leah@libreboot.org>
|
||||
Date: Mon, 30 Oct 2023 22:19:21 +0000
|
||||
Subject: [PATCH 3/9] at_keyboard coreboot: force scancodes2+translate
|
||||
Subject: [PATCH 03/10] at_keyboard coreboot: force scancodes2+translate
|
||||
|
||||
Scan code set 2 with translation should be assumed in
|
||||
every case, as the default starting position.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 831d6824c79032db08a68acbbea6ea374399dba4 Mon Sep 17 00:00:00 2001
|
||||
From 062379b1cd5a4f99324c625fb371c29eb00ad4a2 Mon Sep 17 00:00:00 2001
|
||||
From: Leah Rowe <leah@libreboot.org>
|
||||
Date: Tue, 31 Oct 2023 10:33:28 +0000
|
||||
Subject: [PATCH 4/9] keylayouts: don't print "Unknown key" message
|
||||
Subject: [PATCH 04/10] keylayouts: don't print "Unknown key" message
|
||||
|
||||
on keyboards with stuck keys, this results in GRUB just
|
||||
spewing it repeatedly, preventing use of GRUB.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 095ecdc8ad06ac2581a06e4dacbf4091aba8ec6a Mon Sep 17 00:00:00 2001
|
||||
From e77ca67985c1bef8afd93587232da3d298a8dd51 Mon Sep 17 00:00:00 2001
|
||||
From: Leah Rowe <leah@libreboot.org>
|
||||
Date: Sun, 5 Nov 2023 16:14:58 +0000
|
||||
Subject: [PATCH 5/9] don't print missing prefix errors on the screen
|
||||
Subject: [PATCH 05/10] don't print missing prefix errors on the screen
|
||||
|
||||
we do actually set the prefix. this patch modifies
|
||||
grub to still set grub_errno and return accordingly,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 198cb517f44ada4eb561e3182e61b1598535c51b Mon Sep 17 00:00:00 2001
|
||||
From 9412b6be27bce2d79f154761387d35f44184c069 Mon Sep 17 00:00:00 2001
|
||||
From: Leah Rowe <leah@libreboot.org>
|
||||
Date: Sun, 5 Nov 2023 16:36:22 +0000
|
||||
Subject: [PATCH 6/9] don't print error if module not found
|
||||
Subject: [PATCH 06/10] don't print error if module not found
|
||||
|
||||
still set grub_errno accordingly, and otherwise
|
||||
behave the same. in libreboot, we remove a lot of
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From e344c1bb1bc0bc4df4cf9c049e1e4ba2daf8c2af Mon Sep 17 00:00:00 2001
|
||||
From 2ad50d482cae148df832ccd68f90b8111684ecde Mon Sep 17 00:00:00 2001
|
||||
From: Leah Rowe <leah@libreboot.org>
|
||||
Date: Sun, 5 Nov 2023 17:25:20 +0000
|
||||
Subject: [PATCH 7/9] don't print empty error messages
|
||||
Subject: [PATCH 07/10] don't print empty error messages
|
||||
|
||||
this is part two of the quest to kill the prefix
|
||||
error message. after i disabled prefix-related
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From e390ed303e135f6509889ff1ef3f5e3bcb28e89f Mon Sep 17 00:00:00 2001
|
||||
From 202e20bef3766480aee18e679b9306387be615dc Mon Sep 17 00:00:00 2001
|
||||
From: Mate Kukri <km@mkukri.xyz>
|
||||
Date: Mon, 20 May 2024 11:43:35 +0100
|
||||
Subject: [PATCH 8/9] Add native NVMe driver based on SeaBIOS
|
||||
Subject: [PATCH 08/10] Add native NVMe driver based on SeaBIOS
|
||||
|
||||
Tested to successfully boot Debian on QEMU and OptiPlex 3050.
|
||||
|
||||
@@ -31,10 +31,10 @@ index 43635d5ff..2c86dbbf6 100644
|
||||
|
||||
endif
|
||||
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
|
||||
index fa4bc54aa..c608d0450 100644
|
||||
index 0cf155128..176d35364 100644
|
||||
--- a/grub-core/Makefile.core.def
|
||||
+++ b/grub-core/Makefile.core.def
|
||||
@@ -2768,3 +2768,9 @@ module = {
|
||||
@@ -2773,3 +2773,9 @@ module = {
|
||||
cflags = '-Wno-uninitialized';
|
||||
cppflags = '-I$(srcdir)/lib/libtasn1-grub -I$(srcdir)/tests/asn1/';
|
||||
};
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 53e9097777bfc3830b9d986e9fd2ff00f40b2aa8 Mon Sep 17 00:00:00 2001
|
||||
From 9ec8534a4d27db37cf4feebd44fd9f8973a89e59 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Menzel <pmenzel@molgen.mpg.de>
|
||||
Date: Mon, 17 May 2021 10:24:36 +0200
|
||||
Subject: [PATCH 9/9] kern/coreboot/mmap: Map to reserved
|
||||
Subject: [PATCH 09/10] kern/coreboot/mmap: Map to reserved
|
||||
|
||||
https://git.savannah.gnu.org/cgit/grub.git/commit/?id=6de9ee86bf9ae50967413e6a73b5dfd13e5ffb50
|
||||
|
||||
|
||||
+7
-6
@@ -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 <leah@libreboot.org>
|
||||
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"],
|
||||
|
||||
+30
@@ -0,0 +1,30 @@
|
||||
From abf2bf6e2973ccaa994f63ff851ba11cbd45f1eb Mon Sep 17 00:00:00 2001
|
||||
From: Leah Rowe <leah@libreboot.org>
|
||||
Date: Mon, 19 Jan 2026 15:27:23 +0000
|
||||
Subject: [PATCH 1/1] Revert "configure: Print a more helpful error if
|
||||
autoconf-archive is not installed"
|
||||
|
||||
This reverts commit ac042f3f58d33ce9cd5ff61750f06da1a1d7b0eb.
|
||||
---
|
||||
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.47.3
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
tree="nvme"
|
||||
rev="25b7f6b9344a4bac18c26ce143a156ac2bcb3ec4"
|
||||
rev="eaa3b8f0f90605a82c6bfda4c5c4b73c58eb81ac"
|
||||
|
||||
Reference in New Issue
Block a user