coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-11 05:52:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

update grub to 2.14

Browse Source 
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:
Leah Rowe
2026-01-19 15:31:10 +00:00
parent 21d5050fb4
commit d22f7f9633
50 changed files with 200 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/grub/default/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch
-90
View File
@@ -1,90 +0,0 @@
From 3334727192bca5c64e9e1321da23c4b1e745deb2 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/8] mitigate grub's missing characters for borders/arrow
characters
This cleans up the display on the main screen in GRUB.
Just don't draw a border, at all.
---
grub-core/normal/menu_text.c | 49 ++----------------------------------
1 file changed, 2 insertions(+), 47 deletions(-)
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
index 9c383e64a..8ec1dd1e8 100644
--- a/grub-core/normal/menu_text.c
+++ b/grub-core/normal/menu_text.c
@@ -108,47 +108,6 @@ grub_print_message_indented (const char *msg, int margin_left, int margin_right,
grub_print_message_indented_real (msg, margin_left, margin_right, term, 0);
}
-static void
-draw_border (struct grub_term_output *term, const struct grub_term_screen_geometry *geo)
-{
- int i;
-
- grub_term_setcolorstate (term, GRUB_TERM_COLOR_NORMAL);
-
- grub_term_gotoxy (term, (struct grub_term_coordinate) { geo->first_entry_x - 1,
- geo->first_entry_y - 1 });
- grub_putcode (GRUB_UNICODE_CORNER_UL, term);
- for (i = 0; i < geo->entry_width + 1; i++)
- grub_putcode (GRUB_UNICODE_HLINE, term);
- grub_putcode (GRUB_UNICODE_CORNER_UR, term);
-
- for (i = 0; i < geo->num_entries; i++)
- {
- grub_term_gotoxy (term, (struct grub_term_coordinate) { geo->first_entry_x - 1,
- geo->first_entry_y + i });
- grub_putcode (GRUB_UNICODE_VLINE, term);
- grub_term_gotoxy (term,
- (struct grub_term_coordinate) { geo->first_entry_x + geo->entry_width + 1,
- geo->first_entry_y + i });
- grub_putcode (GRUB_UNICODE_VLINE, term);
- }
-
- grub_term_gotoxy (term,
- (struct grub_term_coordinate) { geo->first_entry_x - 1,
- geo->first_entry_y - 1 + geo->num_entries + 1 });
- grub_putcode (GRUB_UNICODE_CORNER_LL, term);
- for (i = 0; i < geo->entry_width + 1; i++)
- grub_putcode (GRUB_UNICODE_HLINE, term);
- grub_putcode (GRUB_UNICODE_CORNER_LR, term);
-
- grub_term_setcolorstate (term, GRUB_TERM_COLOR_NORMAL);
-
- grub_term_gotoxy (term,
- (struct grub_term_coordinate) { geo->first_entry_x - 1,
- (geo->first_entry_y - 1 + geo->num_entries
- + GRUB_TERM_MARGIN + 1) });
-}
-
static int
print_message (int nested, int edit, struct grub_term_output *term, int dry_run)
{
@@ -167,10 +126,8 @@ command-line or ESC to discard edits and return to the GRUB menu."),
{
char *msg_translated;
- msg_translated = grub_xasprintf (_("Use the %C and %C keys to select which "
- "entry is highlighted."),
- GRUB_UNICODE_UPARROW,
- GRUB_UNICODE_DOWNARROW);
+ msg_translated = grub_xasprintf (_("Use the arrow keys to select which "
+ "entry is highlighted."));
if (!msg_translated)
return 0;
ret += grub_print_message_indented_real (msg_translated, STANDARD_MARGIN,
@@ -413,8 +370,6 @@ grub_menu_init_page (int nested, int edit,
grub_term_normal_color = grub_color_menu_normal;
grub_term_highlight_color = grub_color_menu_highlight;
- if (geo->border)
- draw_border (term, geo);
grub_term_normal_color = old_color_normal;
grub_term_highlight_color = old_color_highlight;
geo->timeout_y = geo->first_entry_y + geo->num_entries
--
2.47.3
config/grub/default/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch → config/grub/default/patches/0001-say-the-name-libreboot-in-the-grub-menu.patch
+3 -3
View File
@@ -1,14 +1,14 @@
From cc6d74da1a6a77935e094601f4f212cd410f5b53 Mon Sep 17 00:00:00 2001
From c6738750164712e2e1f42563bb54d3d14b82cf71 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/8] say the name libreboot, in the grub menu
Subject: [PATCH 1/8] 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,
config/grub/default/patches/0003-at_keyboard-coreboot-force-scancodes2-translate.patch → config/grub/default/patches/0002-at_keyboard-coreboot-force-scancodes2-translate.patch
+2 -2
View File
@@ -1,7 +1,7 @@
From d5aead07155d6eeb36971c0a2e5ee1392a025f91 Mon Sep 17 00:00:00 2001
From fd3e7f0b0f27b22591c12d371e10e1399865c057 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/8] at_keyboard coreboot: force scancodes2+translate
Subject: [PATCH 2/8] at_keyboard coreboot: force scancodes2+translate
Scan code set 2 with translation should be assumed in
every case, as the default starting position.
config/grub/default/patches/0004-keylayouts-don-t-print-Unknown-key-message.patch → config/grub/default/patches/0003-keylayouts-don-t-print-Unknown-key-message.patch
+2 -2
View File
@@ -1,7 +1,7 @@
From 22a0e4608428f7f0131789b6bc0e0203b994163f Mon Sep 17 00:00:00 2001
From 3d3af1a80dc612ef19b9133552945356b221aa66 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/8] keylayouts: don't print "Unknown key" message
Subject: [PATCH 3/8] keylayouts: don't print "Unknown key" message
on keyboards with stuck keys, this results in GRUB just
spewing it repeatedly, preventing use of GRUB.
config/grub/default/patches/0005-don-t-print-missing-prefix-errors-on-the-screen.patch → config/grub/default/patches/0004-don-t-print-missing-prefix-errors-on-the-screen.patch
+2 -2
View File
@@ -1,7 +1,7 @@
From d04a862006aaf754af4d0ec8efee33e9a59c7d0c Mon Sep 17 00:00:00 2001
From 98c460f2d63cf8d838ab1293e3845f22660cd055 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/8] don't print missing prefix errors on the screen
Subject: [PATCH 4/8] 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,
config/grub/default/patches/0006-don-t-print-error-if-module-not-found.patch → config/grub/default/patches/0005-don-t-print-error-if-module-not-found.patch
+2 -2
View File
@@ -1,7 +1,7 @@
From 1d72be25322037c703c5fa95ee29b8ee7b7d7106 Mon Sep 17 00:00:00 2001
From 9a98532ffd75505a561ea4c6b4c17d6a468ace48 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/8] don't print error if module not found
Subject: [PATCH 5/8] 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
config/grub/default/patches/0007-don-t-print-empty-error-messages.patch → config/grub/default/patches/0006-don-t-print-empty-error-messages.patch
+2 -2
View File
@@ -1,7 +1,7 @@
From a0e49c6ae97114afa386286f6005dd9b3a896797 Mon Sep 17 00:00:00 2001
From 1732706e61633b0ee4db18f1af2a5b93888a8af3 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/8] don't print empty error messages
Subject: [PATCH 6/8] don't print empty error messages
this is part two of the quest to kill the prefix
error message. after i disabled prefix-related
config/grub/default/patches/0008-kern-coreboot-mmap-Map-to-reserved.patch → config/grub/default/patches/0007-kern-coreboot-mmap-Map-to-reserved.patch
+2 -2
View File
@@ -1,7 +1,7 @@
From b6f5e33972320c171d0fe44ac2afe4eac0b4b3eb Mon Sep 17 00:00:00 2001
From 72420d66c5c5c933b6e249b7e1a0118670335ae1 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 8/8] kern/coreboot/mmap: Map to reserved
Subject: [PATCH 7/8] kern/coreboot/mmap: Map to reserved
https://git.savannah.gnu.org/cgit/grub.git/commit/?id=6de9ee86bf9ae50967413e6a73b5dfd13e5ffb50
config/grub/default/patches/0009-Revert-configure-Check-linker-for-image-base-support.patch → config/grub/default/patches/0008-Revert-configure-Check-linker-for-image-base-support.patch
+6 -6
View File
@@ -1,7 +1,7 @@
From 70e4ffed2f1cd9b6871341260cae31a5e68c3081 Mon Sep 17 00:00:00 2001
From 52de4ac46b4d384a271d18c33238313334def5bc 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 8/8] Revert "configure: Check linker for --image-base support"
This reverts commit 1a5417f39a0ccefcdd5440f2a67f84d2d2e26960.
---
@@ -26,7 +26,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 +45,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"],
config/grub/default/patches/0009-Revert-configure-Print-a-more-helpful-error-if-autoc.patch
+30
View File
@@ -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
config/grub/default/target.cfg
+1 -1
View File
@@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-3.0-or-later
tree="default"
rev="25b7f6b9344a4bac18c26ce143a156ac2bcb3ec4"
rev="eaa3b8f0f90605a82c6bfda4c5c4b73c58eb81ac"