Upgraded grub to 2.04

Makefile

@@ -22,10 +22,10 @@ xeon-e3-1271: grub.efi
 lenovo-t460s: grub.efi
 
 grub.bios: grub-config
-	tar xf grub-2.02.tar.xz
-	cd grub-2.02 && ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --disable-efiemu --disable-werror
-	$(MAKE) -C grub-2.02
-	$(MAKE) -C grub-2.02 install
+	tar xf grub-2.04.tar.xz
+	cd grub-2.04 && ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --disable-efiemu --disable-werror
+	$(MAKE) -C grub-2.04
+	$(MAKE) -C grub-2.04 install
 	rm /etc/bash_completion.d/grub
 	mkdir -p /boot/grub
 	mkfs -t vfat -n GRUB /dev/$(DISK)1
@@ -34,13 +34,13 @@ grub.bios: grub-config
 	grub-install /dev/$(DISK)
 	@echo "$$GRUB_CONFIG" > /boot/grub/grub.cfg
 	umount /dev/$(DISK)1
-	rm -rf grub-2.02
+	rm -rf grub-2.04
 
 grub.efi32uga: grub-config
-	tar xf grub-2.02.tar.xz
-	cd grub-2.02 && ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --with-platform=efi --target=i386 --disable-werror
-	$(MAKE) -C grub-2.02
-	$(MAKE) -C grub-2.02 install
+	tar xf grub-2.04.tar.xz
+	cd grub-2.04 && ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --with-platform=efi --target=i386 --disable-werror
+	$(MAKE) -C grub-2.04
+	$(MAKE) -C grub-2.04 install
 	rm /etc/bash_completion.d/grub
 	mkdir -p /boot/efi
 	mkfs -t vfat -n EFIBOOT /dev/$(DISK)1
@@ -50,14 +50,14 @@ grub.efi32uga: grub-config
 	grub-mkimage -p /efi/boot -o /boot/efi/EFI/BOOT/bootia32.efi -O i386-efi part_gpt fat ext2 normal linux efi_uga test loadenv reboot hashsum echo halt gcry_sha256
 	@echo "$$GRUB_CONFIG" > /boot/efi/EFI/BOOT/grub.cfg
 	umount /dev/$(DISK)1
-	rm -rf grub-2.02
+	rm -rf grub-2.04
 
 grub.efi: grub-config
-	tar xf grub-2.02.tar.xz
-	patch -Np1 -d grub-2.02 < grub-2.02-relocation_fix-1.patch
-	cd grub-2.02 && ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --with-platform=efi --disable-werror
-	$(MAKE) -C grub-2.02
-	$(MAKE) -C grub-2.02 install
+	tar xf grub-2.04.tar.xz
+	patch -Np1 -d grub-2.04 < grub-2.04-relocation_fix-1.patch
+	cd grub-2.04 && ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --with-platform=efi --disable-werror
+	$(MAKE) -C grub-2.04
+	$(MAKE) -C grub-2.04 install
 	rm /etc/bash_completion.d/grub
 	mkdir -p /boot/efi
 	mkfs -t vfat -n EFIBOOT /dev/$(DISK)1
@@ -67,7 +67,7 @@ grub.efi: grub-config
 	grub-mkimage -p /efi/boot -o /boot/efi/EFI/BOOT/bootx64.efi -O x86_64-efi part_gpt fat ext2 normal linux efi_gop test loadenv reboot hashsum echo halt gcry_sha256
 	@echo "$$GRUB_CONFIG" > /boot/efi/EFI/BOOT/grub.cfg
 	umount /dev/$(DISK)1
-	rm -rf grub-2.02
+	rm -rf grub-2.04
 
 grub-config:
 define GRUB_CONFIG

grub-2.02-relocation_fix-1.patch

-Submitted By:            Xi Ruoyao
-Date:                    2019-01-10
-Initial Package Version: 2.02
-Upstream Status:         Comitted
-Origin:                  Upstream git repository
-Description:             x86_64 assembler in binutils-2.31 generates
-                         R_X86_64_PLT32.  Grub2 should treat it as
-                         R_X86_64_PC32.
-
-diff -Naur grub-2.02.old/util/grub-mkimagexx.c grub-2.02.new/util/grub-mkimagexx.c
---- grub-2.02.old/util/grub-mkimagexx.c	2017-04-24 17:16:00.000000000 +0800
-+++ grub-2.02.new/util/grub-mkimagexx.c	2019-01-10 01:09:53.027377424 +0800
-@@ -832,6 +832,7 @@
- 		  break;
- 
- 		case R_X86_64_PC32:
-+		case R_X86_64_PLT32:
- 		  {
- 		    grub_uint32_t *t32 = (grub_uint32_t *) target;
- 		    *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32)
-diff -Naur grub-2.02.old/util/grub-module-verifier.c grub-2.02.new/util/grub-module-verifier.c
---- grub-2.02.old/util/grub-module-verifier.c	2017-04-24 17:16:00.000000000 +0800
-+++ grub-2.02.new/util/grub-module-verifier.c	2019-01-10 01:10:07.617378227 +0800
-@@ -19,6 +19,7 @@
-       -1
-     }, (int[]){
-       R_X86_64_PC32,
-+      R_X86_64_PLT32,
-       -1
-     }
-   },