import grub2-2.02-83.el8

SOURCES/0216-Disable-multiboot-multiboot2-and-linux16-modules-on-.patch

-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Wed, 11 Jul 2018 13:48:48 -0400
-Subject: [PATCH] Disable multiboot, multiboot2, and linux16 modules on EFI
- builds.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- grub-core/Makefile.core.def | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index aa44d66aca4..d3e3bfd4d7a 100644
---- a/grub-core/Makefile.core.def
-+++ b/grub-core/Makefile.core.def
-@@ -1680,7 +1680,7 @@ module = {
- 
-   common = loader/multiboot.c;
-   common = loader/multiboot_mbi2.c;
--  enable = x86;
-+  enable = i386_pc;
-   enable = mips;
- };
- 
-@@ -1689,7 +1689,7 @@ module = {
-   common = loader/multiboot.c;
-   x86 = loader/i386/multiboot_mbi.c;
-   extra_dist = loader/multiboot_elfxx.c;
--  enable = x86;
-+  enable = i386_pc;
- };
- 
- module = {

SOURCES/0223-Make-efi_netfs-not-duplicate-symbols-from-efinet.patch → SOURCES/0222-Make-efi_netfs-not-duplicate-symbols-from-efinet.patch

@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  1 file changed, 6 deletions(-)
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index d3e3bfd4d7a..715d3a3ec02 100644
+index aa44d66aca4..e35217b8668 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -2186,12 +2186,6 @@ module = {

SOURCES/0224-Rework-how-the-fdt-command-builds.patch → SOURCES/0223-Rework-how-the-fdt-command-builds.patch

@@ -22,7 +22,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
  5 files changed, 9 insertions(+), 5 deletions(-)
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 715d3a3ec02..203584fb00b 100644
+index e35217b8668..cf3d549d212 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -166,7 +166,6 @@ kernel = {

SOURCES/0232-drop-TPM-support-for-legacy-BIOS.patch → SOURCES/0231-drop-TPM-support-for-legacy-BIOS.patch

@@ -38,7 +38,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  delete mode 100644 grub-core/kern/i386/pc/tpm.c
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 203584fb00b..01c5f9ae351 100644
+index cf3d549d212..fb0a1e0babb 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -246,7 +246,6 @@ kernel = {

SOURCES/0233-Move-quicksort-function-from-kernel.exec-to-the-blsc.patch → SOURCES/0232-Move-quicksort-function-from-kernel.exec-to-the-blsc.patch

@@ -27,7 +27,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  rename grub-core/{kern/qsort.c => commands/bls_qsort.h} (93%)
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 01c5f9ae351..f99fc994f6b 100644
+index fb0a1e0babb..3346d1be658 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -129,7 +129,6 @@ kernel = {

SOURCES/0234-Include-blscfg-module-for-powerpc-ieee1275.patch → SOURCES/0233-Include-blscfg-module-for-powerpc-ieee1275.patch

@@ -14,7 +14,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index f99fc994f6b..5b4841e1f00 100644
+index 3346d1be658..6864e780fd4 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -782,6 +782,7 @@ module = {