Skip to content

Commit df31023

Browse files
committed
grub: update to 2.14-2
- Handle the vanillarc kernel variant.
1 parent c1097e7 commit df31023

File tree

74 files changed

+189
-145
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+189
-145
lines changed

app-admin/grub/autobuild/patches/0001-Revert-templates-Properly-disable-the-os-prober-by-d.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From e88970e73fd8f08a10fd13483ac2ee49586c1746 Mon Sep 17 00:00:00 2001
22
From: Javier Martinez Canillas <javierm@redhat.com>
33
Date: Fri, 11 Jun 2021 12:10:54 +0200
4-
Subject: [PATCH 01/72] Revert "templates: Properly disable the os-prober by
4+
Subject: [PATCH 01/73] Revert "templates: Properly disable the os-prober by
55
default"
66

77
This reverts commit 54e0a1bbf1e9106901a557195bb35e5e20fb3925.
@@ -71,5 +71,5 @@ index 5d8d75292..d7693913b 100644
7171

7272
osx_entry() {
7373
--
74-
2.52.0
74+
2.53.0
7575

app-admin/grub/autobuild/patches/0002-Revert-templates-Disable-the-os-prober-by-default.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 4ff98b915f5603b206ca9cccf0553814c57a02d9 Mon Sep 17 00:00:00 2001
22
From: Javier Martinez Canillas <javierm@redhat.com>
33
Date: Fri, 11 Jun 2021 12:10:58 +0200
4-
Subject: [PATCH 02/72] Revert "templates: Disable the os-prober by default"
4+
Subject: [PATCH 02/73] Revert "templates: Disable the os-prober by default"
55

66
This reverts commit e346414725a70e5c74ee87ca14e580c66f517666.
77
---
@@ -69,5 +69,5 @@ index d7693913b..e749dba35 100644
6969

7070
osx_entry() {
7171
--
72-
2.52.0
72+
2.53.0
7373

app-admin/grub/autobuild/patches/0003-Don-t-add-to-highlighted-row.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 3e6574ea506f9d1aceda508e156d1b2cd04333a1 Mon Sep 17 00:00:00 2001
22
From: William Jon McCann <william.jon.mccann@gmail.com>
33
Date: Wed, 15 May 2013 17:49:45 -0400
4-
Subject: [PATCH 03/72] Don't add '*' to highlighted row
4+
Subject: [PATCH 03/73] Don't add '*' to highlighted row
55

66
It is already highlighted.
77
---
@@ -22,5 +22,5 @@ index 9c383e64a..40f352d38 100644
2222
grub_print_ucs4_menu (unicode_title,
2323
unicode_title + len,
2424
--
25-
2.52.0
25+
2.53.0
2626

app-admin/grub/autobuild/patches/0004-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 6df62e9e0bf85ae25fa59efbc29059a64dac71b7 Mon Sep 17 00:00:00 2001
22
From: William Jon McCann <william.jon.mccann@gmail.com>
33
Date: Fri, 7 Jun 2013 14:08:23 -0400
4-
Subject: [PATCH 04/72] Fix border spacing now that we aren't displaying it
4+
Subject: [PATCH 04/73] Fix border spacing now that we aren't displaying it
55

66
---
77
grub-core/normal/menu_text.c | 6 +++---
@@ -28,5 +28,5 @@ index 40f352d38..cd6a5af02 100644
2828
geo->timeout_lines = 2;
2929

3030
--
31-
2.52.0
31+
2.53.0
3232

app-admin/grub/autobuild/patches/0005-Indent-menu-entries.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 5c7235bde4bb48e21e974fb1c3801d4e08b1552a Mon Sep 17 00:00:00 2001
22
From: William Jon McCann <william.jon.mccann@gmail.com>
33
Date: Fri, 7 Jun 2013 14:30:55 -0400
4-
Subject: [PATCH 05/72] Indent menu entries
4+
Subject: [PATCH 05/73] Indent menu entries
55

66
---
77
grub-core/normal/menu_text.c | 3 ++-
@@ -22,5 +22,5 @@ index cd6a5af02..f71435371 100644
2222
grub_print_ucs4_menu (unicode_title,
2323
unicode_title + len,
2424
--
25-
2.52.0
25+
2.53.0
2626

app-admin/grub/autobuild/patches/0006-Fix-margins.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 2f4a261e8342d96ba4fdda30e6330f5de2283eb7 Mon Sep 17 00:00:00 2001
22
From: William Jon McCann <william.jon.mccann@gmail.com>
33
Date: Fri, 7 Jun 2013 14:59:36 -0400
4-
Subject: [PATCH 06/72] Fix margins
4+
Subject: [PATCH 06/73] Fix margins
55

66
---
77
grub-core/normal/menu_text.c | 8 +++-----
@@ -33,5 +33,5 @@ index f71435371..0aaff9a19 100644
3333
- geo->timeout_lines /* timeout */
3434
- 1 /* empty final line */;
3535
--
36-
2.52.0
36+
2.53.0
3737

app-admin/grub/autobuild/patches/0007-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 7cdbcd176a51a5112dfb8657cdb6ec7f01d34b64 Mon Sep 17 00:00:00 2001
22
From: Peter Jones <pjones@redhat.com>
33
Date: Fri, 21 Jun 2013 14:44:08 -0400
4-
Subject: [PATCH 07/72] Use -2 instead of -1 for our right-hand margin, so
4+
Subject: [PATCH 07/73] Use -2 instead of -1 for our right-hand margin, so
55
linewrapping works (#976643).
66

77
Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>
@@ -23,5 +23,5 @@ index 0aaff9a19..4f0a10160 100644
2323
geo->first_entry_y = 3; /* three empty lines*/
2424

2525
--
26-
2.52.0
26+
2.53.0
2727

app-admin/grub/autobuild/patches/0008-Don-t-say-GNU-Linux-in-generated-menus.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From eb7eb307f0eb845ee95293cf0eeab2489c3ae70f Mon Sep 17 00:00:00 2001
22
From: Peter Jones <pjones@redhat.com>
33
Date: Mon, 14 Mar 2011 14:27:42 -0400
4-
Subject: [PATCH 08/72] Don't say "GNU/Linux" in generated menus.
4+
Subject: [PATCH 08/73] Don't say "GNU/Linux" in generated menus.
55

66
---
77
util/grub.d/10_linux.in | 4 ++--
@@ -41,5 +41,5 @@ index 27bff00a8..ee6a60529 100644
4141
fi
4242

4343
--
44-
2.52.0
44+
2.53.0
4545

app-admin/grub/autobuild/patches/0009-Don-t-draw-a-border-around-the-menu.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 14cb218fc9d996e928d7e1cf4392018bbd0bcf26 Mon Sep 17 00:00:00 2001
22
From: William Jon McCann <william.jon.mccann@gmail.com>
33
Date: Wed, 15 May 2013 16:47:33 -0400
4-
Subject: [PATCH 09/72] Don't draw a border around the menu
4+
Subject: [PATCH 09/73] Don't draw a border around the menu
55

66
It looks cleaner without it.
77
---
@@ -70,5 +70,5 @@ index 4f0a10160..90329af7b 100644
7070
grub_term_highlight_color = old_color_highlight;
7171
geo->timeout_y = geo->first_entry_y + geo->num_entries
7272
--
73-
2.52.0
73+
2.53.0
7474

app-admin/grub/autobuild/patches/0010-Use-the-standard-margin-for-the-timeout-string.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 9165cb00c269609c823b7bba36667663dad8fe83 Mon Sep 17 00:00:00 2001
22
From: William Jon McCann <william.jon.mccann@gmail.com>
33
Date: Fri, 7 Jun 2013 10:52:32 -0400
4-
Subject: [PATCH 10/72] Use the standard margin for the timeout string
4+
Subject: [PATCH 10/73] Use the standard margin for the timeout string
55

66
So that it aligns with the other messages
77
---
@@ -39,5 +39,5 @@ index 90329af7b..83573099d 100644
3939
}
4040

4141
--
42-
2.52.0
42+
2.53.0
4343

0 commit comments

Comments
 (0)