From 153bfbba0efcf7edcd1bfc27eb3b8b8e5a0dfe1c Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 13 Jan 2024 00:46:23 +0000 Subject: [PATCH] Use GRUB 2.12 GRUB 2.12 brings many improvements including, but not limited to, detached LUKS keyfile support, and numerous fixes for file system behaviour, compared to GRUB 2.06. GRUB 2.12 also improves memory allocation in GRUB, making it less likely to run out of memory when a lot of memory is used, like when having a very large memdisk. Signed-off-by: Leah Rowe GNUtoo: Use GRUB 2.12 release, remove info about out of tree Argon 2 in the commit message, minimize diff. Acked-by: Denis 'GNUtoo' Carikli --- .../0003-say-the-name-gnuboot-in-the-grub-menu.patch | 6 +++--- resources/packages/grub/download | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/grub/patches/0003-say-the-name-gnuboot-in-the-grub-menu.patch b/resources/grub/patches/0003-say-the-name-gnuboot-in-the-grub-menu.patch index 4e6c6c4..d32a7d0 100644 --- a/resources/grub/patches/0003-say-the-name-gnuboot-in-the-grub-menu.patch +++ b/resources/grub/patches/0003-say-the-name-gnuboot-in-the-grub-menu.patch @@ -8,18 +8,18 @@ Subject: [PATCH 3/3] say the name gnuboot, in the grub menu 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c -index c4ebe9e22..3b7a4fc58 100644 +index bd4431000..31308e16a 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -209,7 +209,7 @@ grub_normal_init_page (struct grub_term_output *term, - + grub_term_cls (term); - msg_formatted = grub_xasprintf (_("GNU GRUB version %s"), PACKAGE_VERSION); + msg_formatted = grub_xasprintf (_("GNUBoot firmware, based on coreboot. https://gnu.org/software/gnuboot/")); if (!msg_formatted) return; - + -- 2.25.1 diff --git a/resources/packages/grub/download b/resources/packages/grub/download index 97bae1e..79736b6 100755 --- a/resources/packages/grub/download +++ b/resources/packages/grub/download @@ -60,7 +60,7 @@ fi # modifications are required cd "grub/" # reset to known revision -git reset --hard 50aace6bdb918150ba47e3c16146dcca271c134a +git reset --hard 5ca9db22e8ed0dbebb2aec53722972de0680a463 for grubpatch in ../resources/grub/patches/*; do git am "${grubpatch}" done @@ -70,7 +70,7 @@ cd gnulib/ # NOTE: when updating this, make sure it's the version specified # in bootstrap.conf on that version of GRUB, as specified above -git reset --hard d271f868a8df9bbec29049d01e056481b7a1a263 +git reset --hard 9f48fb992a3d7e96610c4ce8be969cff2d61a01b rm -Rf .git* )