diff options
| author | Leah Rowe <leah@libreboot.org> | 2022-11-19 16:54:16 +0000 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2022-11-19 16:54:16 +0000 |
| commit | ca45a60ff2553ffb1103d60e2b887acc8e8e13a6 (patch) | |
| tree | 009388080762ca38bfb6d82181f8dc4a08173e32 /resources | |
| parent | c1c76a05f5292bd7303eb185dd3a3b1cae889ca7 (diff) | |
bump grub revision to latest upstream
gnulib too
gnulib...
Diffstat (limited to 'resources')
4 files changed, 11 insertions, 11 deletions
diff --git a/resources/git/revisions b/resources/git/revisions index 927e17de..df03af3b 100644 --- a/resources/git/revisions +++ b/resources/git/revisions @@ -7,14 +7,14 @@ # 'loc', and the git url 'url'. Bkup_url is optional. {grub}{ - rev: 50aace6bdb918150ba47e3c16146dcca271c134a + rev: 1514678888595ef41a968a0c69b7ff769edd1e9c loc: grub url: git://git.savannah.gnu.org/grub.git bkup_url: http://git.savannah.gnu.org/r/grub.git } {gnulib}{ - rev: d271f868a8df9bbec29049d01e056481b7a1a263 + rev: 9f48fb992a3d7e96610c4ce8be969cff2d61a01b loc: grub/gnulib url: git://git.sv.gnu.org/gnulib } diff --git a/resources/grub/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch b/resources/grub/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch index 0f976664..183f5a91 100644 --- a/resources/grub/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch +++ b/resources/grub/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch @@ -1,4 +1,4 @@ -From 2ca3c327501c482ba34af977cd1a7ccac20a35bf Mon Sep 17 00:00:00 2001 +From ce13539fe2103abbd991814d995e06cf96e485f7 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/3] mitigate grub's missing characters for borders/arrow @@ -12,7 +12,7 @@ Just don't draw a border, at all. 1 file changed, 2 insertions(+), 47 deletions(-) diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c -index 18240e76c..4d6282b43 100644 +index b1321eb26..e76094dfd 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, diff --git a/resources/grub/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch b/resources/grub/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch index b0ea1247..8fd98ea0 100644 --- a/resources/grub/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch +++ b/resources/grub/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch @@ -1,6 +1,6 @@ -From 319bd622e033aa585ca90692581bb5fe69c45ceb Mon Sep 17 00:00:00 2001 +From 70f9e72c3ff6381fe3519612de3b649c0cf26b9a Mon Sep 17 00:00:00 2001 From: Leah Rowe <leah@libreboot.org> -Date: Sun, 31 Oct 2021 03:49:26 +0000 +Date: Sat, 19 Nov 2022 16:30:24 +0000 Subject: [PATCH 2/3] say the name libreboot, in the grub menu --- @@ -8,18 +8,18 @@ Subject: [PATCH 2/3] say the name libreboot, 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 (_("libreboot firmware, based on coreboot. https://libreboot.org/")); if (!msg_formatted) return; - + -- 2.25.1 diff --git a/resources/grub/patches/0003-specifically-use-python3-in-gentpl.py.patch b/resources/grub/patches/0003-specifically-use-python3-in-gentpl.py.patch index b170e294..c50f057b 100644 --- a/resources/grub/patches/0003-specifically-use-python3-in-gentpl.py.patch +++ b/resources/grub/patches/0003-specifically-use-python3-in-gentpl.py.patch @@ -1,4 +1,4 @@ -From 49cb9863828b90d1dcbd107f4ce4987d0567b837 Mon Sep 17 00:00:00 2001 +From d30654becf183e14e5c5c8d8216ee52a6437f233 Mon Sep 17 00:00:00 2001 From: Leah Rowe <leah@libreboot.org> Date: Sun, 13 Mar 2022 18:08:57 +0000 Subject: [PATCH 3/3] specifically use python3 in gentpl.py @@ -8,7 +8,7 @@ Subject: [PATCH 3/3] specifically use python3 in gentpl.py 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gentpl.py b/gentpl.py -index c86550d4f..cb89cef37 100644 +index 9f51e4fb6..22cf4439c 100644 --- a/gentpl.py +++ b/gentpl.py @@ -1,4 +1,4 @@ |