From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 30 May 2018 14:43:30 +0000 (+0100)
Subject: grub: Build new version in EFI mode
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=96d0c1362a3046afa1cfcc518b19a29c53e662bd;p=people%2Fms%2Fipfire-2.x.git

grub: Build new version in EFI mode

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/common/x86_64/grub b/config/rootfiles/common/x86_64/grub
index 2d9e9f0d8a..4229be4a57 100644
--- a/config/rootfiles/common/x86_64/grub
+++ b/config/rootfiles/common/x86_64/grub
@@ -3,11 +3,9 @@
 #boot/efi/EFI/ipfire
 #boot/efi/EFI/ipfire/grub-efi
 boot/efi/EFI/ipfire/grub-efi/grub.cfg
-boot/efi/EFI/ipfire/grub-efi/grub.efi
 #boot/grub
 boot/grub/grub.cfg
 boot/grub/splash.png
-boot/grub/unifont.pf2
 #etc/bash_completion.d
 #etc/bash_completion.d/grub
 etc/default/grub
@@ -52,6 +50,8 @@ usr/lib/grub/i386-pc/all_video.mod
 usr/lib/grub/i386-pc/all_video.module
 usr/lib/grub/i386-pc/aout.mod
 usr/lib/grub/i386-pc/aout.module
+usr/lib/grub/i386-pc/archelp.mod
+usr/lib/grub/i386-pc/archelp.module
 usr/lib/grub/i386-pc/at_keyboard.mod
 usr/lib/grub/i386-pc/at_keyboard.module
 usr/lib/grub/i386-pc/ata.mod
@@ -72,22 +72,42 @@ usr/lib/grub/i386-pc/boot.image
 usr/lib/grub/i386-pc/boot.img
 usr/lib/grub/i386-pc/boot.mod
 usr/lib/grub/i386-pc/boot.module
+usr/lib/grub/i386-pc/boot_hybrid.image
+usr/lib/grub/i386-pc/boot_hybrid.img
 usr/lib/grub/i386-pc/bsd.mod
 usr/lib/grub/i386-pc/bsd.module
+usr/lib/grub/i386-pc/bswap_test.mod
+usr/lib/grub/i386-pc/bswap_test.module
 usr/lib/grub/i386-pc/btrfs.mod
 usr/lib/grub/i386-pc/btrfs.module
 usr/lib/grub/i386-pc/bufio.mod
 usr/lib/grub/i386-pc/bufio.module
 usr/lib/grub/i386-pc/cat.mod
 usr/lib/grub/i386-pc/cat.module
+usr/lib/grub/i386-pc/cbfs.mod
+usr/lib/grub/i386-pc/cbfs.module
+usr/lib/grub/i386-pc/cbls.mod
+usr/lib/grub/i386-pc/cbls.module
+usr/lib/grub/i386-pc/cbmemc.mod
+usr/lib/grub/i386-pc/cbmemc.module
+usr/lib/grub/i386-pc/cbtable.mod
+usr/lib/grub/i386-pc/cbtable.module
+usr/lib/grub/i386-pc/cbtime.mod
+usr/lib/grub/i386-pc/cbtime.module
 usr/lib/grub/i386-pc/cdboot.image
 usr/lib/grub/i386-pc/cdboot.img
 usr/lib/grub/i386-pc/chain.mod
 usr/lib/grub/i386-pc/chain.module
+usr/lib/grub/i386-pc/cmdline_cat_test.mod
+usr/lib/grub/i386-pc/cmdline_cat_test.module
+usr/lib/grub/i386-pc/cmosdump.mod
+usr/lib/grub/i386-pc/cmosdump.module
 usr/lib/grub/i386-pc/cmostest.mod
 usr/lib/grub/i386-pc/cmostest.module
 usr/lib/grub/i386-pc/cmp.mod
 usr/lib/grub/i386-pc/cmp.module
+usr/lib/grub/i386-pc/cmp_test.mod
+usr/lib/grub/i386-pc/cmp_test.module
 usr/lib/grub/i386-pc/command.lst
 usr/lib/grub/i386-pc/config.h
 usr/lib/grub/i386-pc/configfile.mod
@@ -107,16 +127,24 @@ usr/lib/grub/i386-pc/cryptodisk.mod
 usr/lib/grub/i386-pc/cryptodisk.module
 usr/lib/grub/i386-pc/cs5536.mod
 usr/lib/grub/i386-pc/cs5536.module
+usr/lib/grub/i386-pc/ctz_test.mod
+usr/lib/grub/i386-pc/ctz_test.module
 usr/lib/grub/i386-pc/date.mod
 usr/lib/grub/i386-pc/date.module
 usr/lib/grub/i386-pc/datehook.mod
 usr/lib/grub/i386-pc/datehook.module
 usr/lib/grub/i386-pc/datetime.mod
 usr/lib/grub/i386-pc/datetime.module
+usr/lib/grub/i386-pc/disk.mod
+usr/lib/grub/i386-pc/disk.module
 usr/lib/grub/i386-pc/diskboot.image
 usr/lib/grub/i386-pc/diskboot.img
 usr/lib/grub/i386-pc/diskfilter.mod
 usr/lib/grub/i386-pc/diskfilter.module
+usr/lib/grub/i386-pc/div.mod
+usr/lib/grub/i386-pc/div.module
+usr/lib/grub/i386-pc/div_test.mod
+usr/lib/grub/i386-pc/div_test.module
 usr/lib/grub/i386-pc/dm_nv.mod
 usr/lib/grub/i386-pc/dm_nv.module
 usr/lib/grub/i386-pc/drivemap.mod
@@ -131,6 +159,8 @@ usr/lib/grub/i386-pc/ehci.mod
 usr/lib/grub/i386-pc/ehci.module
 usr/lib/grub/i386-pc/elf.mod
 usr/lib/grub/i386-pc/elf.module
+usr/lib/grub/i386-pc/eval.mod
+usr/lib/grub/i386-pc/eval.module
 usr/lib/grub/i386-pc/exfat.mod
 usr/lib/grub/i386-pc/exfat.module
 usr/lib/grub/i386-pc/exfctest.mod
@@ -141,6 +171,8 @@ usr/lib/grub/i386-pc/extcmd.mod
 usr/lib/grub/i386-pc/extcmd.module
 usr/lib/grub/i386-pc/fat.mod
 usr/lib/grub/i386-pc/fat.module
+usr/lib/grub/i386-pc/file.mod
+usr/lib/grub/i386-pc/file.module
 usr/lib/grub/i386-pc/font.mod
 usr/lib/grub/i386-pc/font.module
 usr/lib/grub/i386-pc/freedos.mod
@@ -162,6 +194,10 @@ usr/lib/grub/i386-pc/gcry_crc.mod
 usr/lib/grub/i386-pc/gcry_crc.module
 usr/lib/grub/i386-pc/gcry_des.mod
 usr/lib/grub/i386-pc/gcry_des.module
+usr/lib/grub/i386-pc/gcry_dsa.mod
+usr/lib/grub/i386-pc/gcry_dsa.module
+usr/lib/grub/i386-pc/gcry_idea.mod
+usr/lib/grub/i386-pc/gcry_idea.module
 usr/lib/grub/i386-pc/gcry_md4.mod
 usr/lib/grub/i386-pc/gcry_md4.module
 usr/lib/grub/i386-pc/gcry_md5.mod
@@ -172,6 +208,8 @@ usr/lib/grub/i386-pc/gcry_rijndael.mod
 usr/lib/grub/i386-pc/gcry_rijndael.module
 usr/lib/grub/i386-pc/gcry_rmd160.mod
 usr/lib/grub/i386-pc/gcry_rmd160.module
+usr/lib/grub/i386-pc/gcry_rsa.mod
+usr/lib/grub/i386-pc/gcry_rsa.module
 usr/lib/grub/i386-pc/gcry_seed.mod
 usr/lib/grub/i386-pc/gcry_seed.module
 usr/lib/grub/i386-pc/gcry_serpent.mod
@@ -199,6 +237,10 @@ usr/lib/grub/i386-pc/gfxmenu.mod
 usr/lib/grub/i386-pc/gfxmenu.module
 usr/lib/grub/i386-pc/gfxterm.mod
 usr/lib/grub/i386-pc/gfxterm.module
+usr/lib/grub/i386-pc/gfxterm_background.mod
+usr/lib/grub/i386-pc/gfxterm_background.module
+usr/lib/grub/i386-pc/gfxterm_menu.mod
+usr/lib/grub/i386-pc/gfxterm_menu.module
 usr/lib/grub/i386-pc/gmodule.pl
 usr/lib/grub/i386-pc/gptsync.mod
 usr/lib/grub/i386-pc/gptsync.module
@@ -220,6 +262,8 @@ usr/lib/grub/i386-pc/hfs.mod
 usr/lib/grub/i386-pc/hfs.module
 usr/lib/grub/i386-pc/hfsplus.mod
 usr/lib/grub/i386-pc/hfsplus.module
+usr/lib/grub/i386-pc/hfspluscomp.mod
+usr/lib/grub/i386-pc/hfspluscomp.module
 usr/lib/grub/i386-pc/http.mod
 usr/lib/grub/i386-pc/http.module
 usr/lib/grub/i386-pc/iorw.mod
@@ -238,6 +282,8 @@ usr/lib/grub/i386-pc/keystatus.mod
 usr/lib/grub/i386-pc/keystatus.module
 usr/lib/grub/i386-pc/ldm.mod
 usr/lib/grub/i386-pc/ldm.module
+usr/lib/grub/i386-pc/legacy_password_test.mod
+usr/lib/grub/i386-pc/legacy_password_test.module
 usr/lib/grub/i386-pc/legacycfg.mod
 usr/lib/grub/i386-pc/legacycfg.module
 usr/lib/grub/i386-pc/linux.mod
@@ -268,6 +314,12 @@ usr/lib/grub/i386-pc/lzma_decompress.image
 usr/lib/grub/i386-pc/lzma_decompress.img
 usr/lib/grub/i386-pc/lzopio.mod
 usr/lib/grub/i386-pc/lzopio.module
+usr/lib/grub/i386-pc/macbless.mod
+usr/lib/grub/i386-pc/macbless.module
+usr/lib/grub/i386-pc/macho.mod
+usr/lib/grub/i386-pc/macho.module
+usr/lib/grub/i386-pc/mda_text.mod
+usr/lib/grub/i386-pc/mda_text.module
 usr/lib/grub/i386-pc/mdraid09.mod
 usr/lib/grub/i386-pc/mdraid09.module
 usr/lib/grub/i386-pc/mdraid09_be.mod
@@ -296,12 +348,20 @@ usr/lib/grub/i386-pc/mmap.mod
 usr/lib/grub/i386-pc/mmap.module
 usr/lib/grub/i386-pc/moddep.lst
 usr/lib/grub/i386-pc/modinfo.sh
+usr/lib/grub/i386-pc/morse.mod
+usr/lib/grub/i386-pc/morse.module
+usr/lib/grub/i386-pc/mpi.mod
+usr/lib/grub/i386-pc/mpi.module
 usr/lib/grub/i386-pc/msdospart.mod
 usr/lib/grub/i386-pc/msdospart.module
+usr/lib/grub/i386-pc/mul_test.mod
+usr/lib/grub/i386-pc/mul_test.module
 usr/lib/grub/i386-pc/multiboot.mod
 usr/lib/grub/i386-pc/multiboot.module
 usr/lib/grub/i386-pc/multiboot2.mod
 usr/lib/grub/i386-pc/multiboot2.module
+usr/lib/grub/i386-pc/nativedisk.mod
+usr/lib/grub/i386-pc/nativedisk.module
 usr/lib/grub/i386-pc/net.mod
 usr/lib/grub/i386-pc/net.module
 usr/lib/grub/i386-pc/newc.mod
@@ -318,6 +378,8 @@ usr/lib/grub/i386-pc/ntldr.mod
 usr/lib/grub/i386-pc/ntldr.module
 usr/lib/grub/i386-pc/odc.mod
 usr/lib/grub/i386-pc/odc.module
+usr/lib/grub/i386-pc/offsetio.mod
+usr/lib/grub/i386-pc/offsetio.module
 usr/lib/grub/i386-pc/ohci.mod
 usr/lib/grub/i386-pc/ohci.module
 usr/lib/grub/i386-pc/part_acorn.mod
@@ -328,6 +390,8 @@ usr/lib/grub/i386-pc/part_apple.mod
 usr/lib/grub/i386-pc/part_apple.module
 usr/lib/grub/i386-pc/part_bsd.mod
 usr/lib/grub/i386-pc/part_bsd.module
+usr/lib/grub/i386-pc/part_dfly.mod
+usr/lib/grub/i386-pc/part_dfly.module
 usr/lib/grub/i386-pc/part_dvh.mod
 usr/lib/grub/i386-pc/part_dvh.module
 usr/lib/grub/i386-pc/part_gpt.mod
@@ -352,8 +416,12 @@ usr/lib/grub/i386-pc/pata.mod
 usr/lib/grub/i386-pc/pata.module
 usr/lib/grub/i386-pc/pbkdf2.mod
 usr/lib/grub/i386-pc/pbkdf2.module
+usr/lib/grub/i386-pc/pbkdf2_test.mod
+usr/lib/grub/i386-pc/pbkdf2_test.module
 usr/lib/grub/i386-pc/pci.mod
 usr/lib/grub/i386-pc/pci.module
+usr/lib/grub/i386-pc/pcidump.mod
+usr/lib/grub/i386-pc/pcidump.module
 usr/lib/grub/i386-pc/plan9.mod
 usr/lib/grub/i386-pc/plan9.module
 usr/lib/grub/i386-pc/play.mod
@@ -364,6 +432,10 @@ usr/lib/grub/i386-pc/priority_queue.mod
 usr/lib/grub/i386-pc/priority_queue.module
 usr/lib/grub/i386-pc/probe.mod
 usr/lib/grub/i386-pc/probe.module
+usr/lib/grub/i386-pc/procfs.mod
+usr/lib/grub/i386-pc/procfs.module
+usr/lib/grub/i386-pc/progress.mod
+usr/lib/grub/i386-pc/progress.module
 usr/lib/grub/i386-pc/pxe.mod
 usr/lib/grub/i386-pc/pxe.module
 usr/lib/grub/i386-pc/pxeboot.image
@@ -374,6 +446,8 @@ usr/lib/grub/i386-pc/raid5rec.mod
 usr/lib/grub/i386-pc/raid5rec.module
 usr/lib/grub/i386-pc/raid6rec.mod
 usr/lib/grub/i386-pc/raid6rec.module
+usr/lib/grub/i386-pc/random.mod
+usr/lib/grub/i386-pc/random.module
 usr/lib/grub/i386-pc/read.mod
 usr/lib/grub/i386-pc/read.module
 usr/lib/grub/i386-pc/reboot.mod
@@ -402,14 +476,26 @@ usr/lib/grub/i386-pc/serial.mod
 usr/lib/grub/i386-pc/serial.module
 usr/lib/grub/i386-pc/setjmp.mod
 usr/lib/grub/i386-pc/setjmp.module
+usr/lib/grub/i386-pc/setjmp_test.mod
+usr/lib/grub/i386-pc/setjmp_test.module
 usr/lib/grub/i386-pc/setpci.mod
 usr/lib/grub/i386-pc/setpci.module
 usr/lib/grub/i386-pc/sfs.mod
 usr/lib/grub/i386-pc/sfs.module
+usr/lib/grub/i386-pc/shift_test.mod
+usr/lib/grub/i386-pc/shift_test.module
+usr/lib/grub/i386-pc/signature_test.mod
+usr/lib/grub/i386-pc/signature_test.module
 usr/lib/grub/i386-pc/sleep.mod
 usr/lib/grub/i386-pc/sleep.module
+usr/lib/grub/i386-pc/sleep_test.mod
+usr/lib/grub/i386-pc/sleep_test.module
+usr/lib/grub/i386-pc/spkmodem.mod
+usr/lib/grub/i386-pc/spkmodem.module
 usr/lib/grub/i386-pc/squash4.mod
 usr/lib/grub/i386-pc/squash4.module
+usr/lib/grub/i386-pc/syslinuxcfg.mod
+usr/lib/grub/i386-pc/syslinuxcfg.module
 usr/lib/grub/i386-pc/tar.mod
 usr/lib/grub/i386-pc/tar.module
 usr/lib/grub/i386-pc/terminal.lst
@@ -423,20 +509,28 @@ usr/lib/grub/i386-pc/test_blockarg.mod
 usr/lib/grub/i386-pc/test_blockarg.module
 usr/lib/grub/i386-pc/testload.mod
 usr/lib/grub/i386-pc/testload.module
+usr/lib/grub/i386-pc/testspeed.mod
+usr/lib/grub/i386-pc/testspeed.module
 usr/lib/grub/i386-pc/tftp.mod
 usr/lib/grub/i386-pc/tftp.module
 usr/lib/grub/i386-pc/tga.mod
 usr/lib/grub/i386-pc/tga.module
 usr/lib/grub/i386-pc/time.mod
 usr/lib/grub/i386-pc/time.module
+usr/lib/grub/i386-pc/tr.mod
+usr/lib/grub/i386-pc/tr.module
 usr/lib/grub/i386-pc/trig.mod
 usr/lib/grub/i386-pc/trig.module
 usr/lib/grub/i386-pc/true.mod
 usr/lib/grub/i386-pc/true.module
+usr/lib/grub/i386-pc/truecrypt.mod
+usr/lib/grub/i386-pc/truecrypt.module
 usr/lib/grub/i386-pc/udf.mod
 usr/lib/grub/i386-pc/udf.module
 usr/lib/grub/i386-pc/ufs1.mod
 usr/lib/grub/i386-pc/ufs1.module
+usr/lib/grub/i386-pc/ufs1_be.mod
+usr/lib/grub/i386-pc/ufs1_be.module
 usr/lib/grub/i386-pc/ufs2.mod
 usr/lib/grub/i386-pc/ufs2.module
 usr/lib/grub/i386-pc/uhci.mod
@@ -453,10 +547,14 @@ usr/lib/grub/i386-pc/usbserial_ftdi.mod
 usr/lib/grub/i386-pc/usbserial_ftdi.module
 usr/lib/grub/i386-pc/usbserial_pl2303.mod
 usr/lib/grub/i386-pc/usbserial_pl2303.module
+usr/lib/grub/i386-pc/usbserial_usbdebug.mod
+usr/lib/grub/i386-pc/usbserial_usbdebug.module
 usr/lib/grub/i386-pc/usbtest.mod
 usr/lib/grub/i386-pc/usbtest.module
 usr/lib/grub/i386-pc/vbe.mod
 usr/lib/grub/i386-pc/vbe.module
+usr/lib/grub/i386-pc/verify.mod
+usr/lib/grub/i386-pc/verify.module
 usr/lib/grub/i386-pc/vga.mod
 usr/lib/grub/i386-pc/vga.module
 usr/lib/grub/i386-pc/vga_text.mod
@@ -468,18 +566,24 @@ usr/lib/grub/i386-pc/video_bochs.mod
 usr/lib/grub/i386-pc/video_bochs.module
 usr/lib/grub/i386-pc/video_cirrus.mod
 usr/lib/grub/i386-pc/video_cirrus.module
+usr/lib/grub/i386-pc/video_colors.mod
+usr/lib/grub/i386-pc/video_colors.module
 usr/lib/grub/i386-pc/video_fb.mod
 usr/lib/grub/i386-pc/video_fb.module
 usr/lib/grub/i386-pc/videoinfo.mod
 usr/lib/grub/i386-pc/videoinfo.module
 usr/lib/grub/i386-pc/videotest.mod
 usr/lib/grub/i386-pc/videotest.module
+usr/lib/grub/i386-pc/videotest_checksum.mod
+usr/lib/grub/i386-pc/videotest_checksum.module
 usr/lib/grub/i386-pc/xfs.mod
 usr/lib/grub/i386-pc/xfs.module
 usr/lib/grub/i386-pc/xnu.mod
 usr/lib/grub/i386-pc/xnu.module
 usr/lib/grub/i386-pc/xnu_uuid.mod
 usr/lib/grub/i386-pc/xnu_uuid.module
+usr/lib/grub/i386-pc/xnu_uuid_test.mod
+usr/lib/grub/i386-pc/xnu_uuid_test.module
 usr/lib/grub/i386-pc/xzio.mod
 usr/lib/grub/i386-pc/xzio.module
 usr/lib/grub/i386-pc/zfs.mod
@@ -505,6 +609,8 @@ usr/lib/grub/x86_64-efi/aout.mod
 usr/lib/grub/x86_64-efi/aout.module
 usr/lib/grub/x86_64-efi/appleldr.mod
 usr/lib/grub/x86_64-efi/appleldr.module
+usr/lib/grub/x86_64-efi/archelp.mod
+usr/lib/grub/x86_64-efi/archelp.module
 usr/lib/grub/x86_64-efi/at_keyboard.mod
 usr/lib/grub/x86_64-efi/at_keyboard.module
 usr/lib/grub/x86_64-efi/ata.mod
@@ -523,16 +629,32 @@ usr/lib/grub/x86_64-efi/boot.mod
 usr/lib/grub/x86_64-efi/boot.module
 usr/lib/grub/x86_64-efi/bsd.mod
 usr/lib/grub/x86_64-efi/bsd.module
+usr/lib/grub/x86_64-efi/bswap_test.mod
+usr/lib/grub/x86_64-efi/bswap_test.module
 usr/lib/grub/x86_64-efi/btrfs.mod
 usr/lib/grub/x86_64-efi/btrfs.module
 usr/lib/grub/x86_64-efi/bufio.mod
 usr/lib/grub/x86_64-efi/bufio.module
 usr/lib/grub/x86_64-efi/cat.mod
 usr/lib/grub/x86_64-efi/cat.module
+usr/lib/grub/x86_64-efi/cbfs.mod
+usr/lib/grub/x86_64-efi/cbfs.module
+usr/lib/grub/x86_64-efi/cbls.mod
+usr/lib/grub/x86_64-efi/cbls.module
+usr/lib/grub/x86_64-efi/cbmemc.mod
+usr/lib/grub/x86_64-efi/cbmemc.module
+usr/lib/grub/x86_64-efi/cbtable.mod
+usr/lib/grub/x86_64-efi/cbtable.module
+usr/lib/grub/x86_64-efi/cbtime.mod
+usr/lib/grub/x86_64-efi/cbtime.module
 usr/lib/grub/x86_64-efi/chain.mod
 usr/lib/grub/x86_64-efi/chain.module
+usr/lib/grub/x86_64-efi/cmdline_cat_test.mod
+usr/lib/grub/x86_64-efi/cmdline_cat_test.module
 usr/lib/grub/x86_64-efi/cmp.mod
 usr/lib/grub/x86_64-efi/cmp.module
+usr/lib/grub/x86_64-efi/cmp_test.mod
+usr/lib/grub/x86_64-efi/cmp_test.module
 usr/lib/grub/x86_64-efi/command.lst
 usr/lib/grub/x86_64-efi/config.h
 usr/lib/grub/x86_64-efi/configfile.mod
@@ -552,14 +674,22 @@ usr/lib/grub/x86_64-efi/cryptodisk.mod
 usr/lib/grub/x86_64-efi/cryptodisk.module
 usr/lib/grub/x86_64-efi/cs5536.mod
 usr/lib/grub/x86_64-efi/cs5536.module
+usr/lib/grub/x86_64-efi/ctz_test.mod
+usr/lib/grub/x86_64-efi/ctz_test.module
 usr/lib/grub/x86_64-efi/date.mod
 usr/lib/grub/x86_64-efi/date.module
 usr/lib/grub/x86_64-efi/datehook.mod
 usr/lib/grub/x86_64-efi/datehook.module
 usr/lib/grub/x86_64-efi/datetime.mod
 usr/lib/grub/x86_64-efi/datetime.module
+usr/lib/grub/x86_64-efi/disk.mod
+usr/lib/grub/x86_64-efi/disk.module
 usr/lib/grub/x86_64-efi/diskfilter.mod
 usr/lib/grub/x86_64-efi/diskfilter.module
+usr/lib/grub/x86_64-efi/div.mod
+usr/lib/grub/x86_64-efi/div.module
+usr/lib/grub/x86_64-efi/div_test.mod
+usr/lib/grub/x86_64-efi/div_test.module
 usr/lib/grub/x86_64-efi/dm_nv.mod
 usr/lib/grub/x86_64-efi/dm_nv.module
 usr/lib/grub/x86_64-efi/echo.mod
@@ -568,12 +698,16 @@ usr/lib/grub/x86_64-efi/efi_gop.mod
 usr/lib/grub/x86_64-efi/efi_gop.module
 usr/lib/grub/x86_64-efi/efi_uga.mod
 usr/lib/grub/x86_64-efi/efi_uga.module
+usr/lib/grub/x86_64-efi/efifwsetup.mod
+usr/lib/grub/x86_64-efi/efifwsetup.module
 usr/lib/grub/x86_64-efi/efinet.mod
 usr/lib/grub/x86_64-efi/efinet.module
 usr/lib/grub/x86_64-efi/ehci.mod
 usr/lib/grub/x86_64-efi/ehci.module
 usr/lib/grub/x86_64-efi/elf.mod
 usr/lib/grub/x86_64-efi/elf.module
+usr/lib/grub/x86_64-efi/eval.mod
+usr/lib/grub/x86_64-efi/eval.module
 usr/lib/grub/x86_64-efi/exfat.mod
 usr/lib/grub/x86_64-efi/exfat.module
 usr/lib/grub/x86_64-efi/exfctest.mod
@@ -584,6 +718,8 @@ usr/lib/grub/x86_64-efi/extcmd.mod
 usr/lib/grub/x86_64-efi/extcmd.module
 usr/lib/grub/x86_64-efi/fat.mod
 usr/lib/grub/x86_64-efi/fat.module
+usr/lib/grub/x86_64-efi/file.mod
+usr/lib/grub/x86_64-efi/file.module
 usr/lib/grub/x86_64-efi/fixvideo.mod
 usr/lib/grub/x86_64-efi/fixvideo.module
 usr/lib/grub/x86_64-efi/font.mod
@@ -605,6 +741,10 @@ usr/lib/grub/x86_64-efi/gcry_crc.mod
 usr/lib/grub/x86_64-efi/gcry_crc.module
 usr/lib/grub/x86_64-efi/gcry_des.mod
 usr/lib/grub/x86_64-efi/gcry_des.module
+usr/lib/grub/x86_64-efi/gcry_dsa.mod
+usr/lib/grub/x86_64-efi/gcry_dsa.module
+usr/lib/grub/x86_64-efi/gcry_idea.mod
+usr/lib/grub/x86_64-efi/gcry_idea.module
 usr/lib/grub/x86_64-efi/gcry_md4.mod
 usr/lib/grub/x86_64-efi/gcry_md4.module
 usr/lib/grub/x86_64-efi/gcry_md5.mod
@@ -615,6 +755,8 @@ usr/lib/grub/x86_64-efi/gcry_rijndael.mod
 usr/lib/grub/x86_64-efi/gcry_rijndael.module
 usr/lib/grub/x86_64-efi/gcry_rmd160.mod
 usr/lib/grub/x86_64-efi/gcry_rmd160.module
+usr/lib/grub/x86_64-efi/gcry_rsa.mod
+usr/lib/grub/x86_64-efi/gcry_rsa.module
 usr/lib/grub/x86_64-efi/gcry_seed.mod
 usr/lib/grub/x86_64-efi/gcry_seed.module
 usr/lib/grub/x86_64-efi/gcry_serpent.mod
@@ -640,6 +782,10 @@ usr/lib/grub/x86_64-efi/gfxmenu.mod
 usr/lib/grub/x86_64-efi/gfxmenu.module
 usr/lib/grub/x86_64-efi/gfxterm.mod
 usr/lib/grub/x86_64-efi/gfxterm.module
+usr/lib/grub/x86_64-efi/gfxterm_background.mod
+usr/lib/grub/x86_64-efi/gfxterm_background.module
+usr/lib/grub/x86_64-efi/gfxterm_menu.mod
+usr/lib/grub/x86_64-efi/gfxterm_menu.module
 usr/lib/grub/x86_64-efi/gmodule.pl
 usr/lib/grub/x86_64-efi/gptsync.mod
 usr/lib/grub/x86_64-efi/gptsync.module
@@ -661,6 +807,8 @@ usr/lib/grub/x86_64-efi/hfs.mod
 usr/lib/grub/x86_64-efi/hfs.module
 usr/lib/grub/x86_64-efi/hfsplus.mod
 usr/lib/grub/x86_64-efi/hfsplus.module
+usr/lib/grub/x86_64-efi/hfspluscomp.mod
+usr/lib/grub/x86_64-efi/hfspluscomp.module
 usr/lib/grub/x86_64-efi/http.mod
 usr/lib/grub/x86_64-efi/http.module
 usr/lib/grub/x86_64-efi/iorw.mod
@@ -679,8 +827,14 @@ usr/lib/grub/x86_64-efi/keystatus.mod
 usr/lib/grub/x86_64-efi/keystatus.module
 usr/lib/grub/x86_64-efi/ldm.mod
 usr/lib/grub/x86_64-efi/ldm.module
+usr/lib/grub/x86_64-efi/legacy_password_test.mod
+usr/lib/grub/x86_64-efi/legacy_password_test.module
+usr/lib/grub/x86_64-efi/legacycfg.mod
+usr/lib/grub/x86_64-efi/legacycfg.module
 usr/lib/grub/x86_64-efi/linux.mod
 usr/lib/grub/x86_64-efi/linux.module
+usr/lib/grub/x86_64-efi/linux16.mod
+usr/lib/grub/x86_64-efi/linux16.module
 usr/lib/grub/x86_64-efi/loadbios.mod
 usr/lib/grub/x86_64-efi/loadbios.module
 usr/lib/grub/x86_64-efi/loadenv.mod
@@ -691,6 +845,8 @@ usr/lib/grub/x86_64-efi/ls.mod
 usr/lib/grub/x86_64-efi/ls.module
 usr/lib/grub/x86_64-efi/lsacpi.mod
 usr/lib/grub/x86_64-efi/lsacpi.module
+usr/lib/grub/x86_64-efi/lsefi.mod
+usr/lib/grub/x86_64-efi/lsefi.module
 usr/lib/grub/x86_64-efi/lsefimmap.mod
 usr/lib/grub/x86_64-efi/lsefimmap.module
 usr/lib/grub/x86_64-efi/lsefisystab.mod
@@ -707,6 +863,10 @@ usr/lib/grub/x86_64-efi/lvm.mod
 usr/lib/grub/x86_64-efi/lvm.module
 usr/lib/grub/x86_64-efi/lzopio.mod
 usr/lib/grub/x86_64-efi/lzopio.module
+usr/lib/grub/x86_64-efi/macbless.mod
+usr/lib/grub/x86_64-efi/macbless.module
+usr/lib/grub/x86_64-efi/macho.mod
+usr/lib/grub/x86_64-efi/macho.module
 usr/lib/grub/x86_64-efi/mdraid09.mod
 usr/lib/grub/x86_64-efi/mdraid09.module
 usr/lib/grub/x86_64-efi/mdraid09_be.mod
@@ -735,12 +895,20 @@ usr/lib/grub/x86_64-efi/mmap.mod
 usr/lib/grub/x86_64-efi/mmap.module
 usr/lib/grub/x86_64-efi/moddep.lst
 usr/lib/grub/x86_64-efi/modinfo.sh
+usr/lib/grub/x86_64-efi/morse.mod
+usr/lib/grub/x86_64-efi/morse.module
+usr/lib/grub/x86_64-efi/mpi.mod
+usr/lib/grub/x86_64-efi/mpi.module
 usr/lib/grub/x86_64-efi/msdospart.mod
 usr/lib/grub/x86_64-efi/msdospart.module
+usr/lib/grub/x86_64-efi/mul_test.mod
+usr/lib/grub/x86_64-efi/mul_test.module
 usr/lib/grub/x86_64-efi/multiboot.mod
 usr/lib/grub/x86_64-efi/multiboot.module
 usr/lib/grub/x86_64-efi/multiboot2.mod
 usr/lib/grub/x86_64-efi/multiboot2.module
+usr/lib/grub/x86_64-efi/nativedisk.mod
+usr/lib/grub/x86_64-efi/nativedisk.module
 usr/lib/grub/x86_64-efi/net.mod
 usr/lib/grub/x86_64-efi/net.module
 usr/lib/grub/x86_64-efi/newc.mod
@@ -755,6 +923,8 @@ usr/lib/grub/x86_64-efi/ntfscomp.mod
 usr/lib/grub/x86_64-efi/ntfscomp.module
 usr/lib/grub/x86_64-efi/odc.mod
 usr/lib/grub/x86_64-efi/odc.module
+usr/lib/grub/x86_64-efi/offsetio.mod
+usr/lib/grub/x86_64-efi/offsetio.module
 usr/lib/grub/x86_64-efi/ohci.mod
 usr/lib/grub/x86_64-efi/ohci.module
 usr/lib/grub/x86_64-efi/part_acorn.mod
@@ -765,6 +935,8 @@ usr/lib/grub/x86_64-efi/part_apple.mod
 usr/lib/grub/x86_64-efi/part_apple.module
 usr/lib/grub/x86_64-efi/part_bsd.mod
 usr/lib/grub/x86_64-efi/part_bsd.module
+usr/lib/grub/x86_64-efi/part_dfly.mod
+usr/lib/grub/x86_64-efi/part_dfly.module
 usr/lib/grub/x86_64-efi/part_dvh.mod
 usr/lib/grub/x86_64-efi/part_dvh.module
 usr/lib/grub/x86_64-efi/part_gpt.mod
@@ -789,6 +961,10 @@ usr/lib/grub/x86_64-efi/pata.mod
 usr/lib/grub/x86_64-efi/pata.module
 usr/lib/grub/x86_64-efi/pbkdf2.mod
 usr/lib/grub/x86_64-efi/pbkdf2.module
+usr/lib/grub/x86_64-efi/pbkdf2_test.mod
+usr/lib/grub/x86_64-efi/pbkdf2_test.module
+usr/lib/grub/x86_64-efi/pcidump.mod
+usr/lib/grub/x86_64-efi/pcidump.module
 usr/lib/grub/x86_64-efi/play.mod
 usr/lib/grub/x86_64-efi/play.module
 usr/lib/grub/x86_64-efi/png.mod
@@ -797,10 +973,16 @@ usr/lib/grub/x86_64-efi/priority_queue.mod
 usr/lib/grub/x86_64-efi/priority_queue.module
 usr/lib/grub/x86_64-efi/probe.mod
 usr/lib/grub/x86_64-efi/probe.module
+usr/lib/grub/x86_64-efi/procfs.mod
+usr/lib/grub/x86_64-efi/procfs.module
+usr/lib/grub/x86_64-efi/progress.mod
+usr/lib/grub/x86_64-efi/progress.module
 usr/lib/grub/x86_64-efi/raid5rec.mod
 usr/lib/grub/x86_64-efi/raid5rec.module
 usr/lib/grub/x86_64-efi/raid6rec.mod
 usr/lib/grub/x86_64-efi/raid6rec.module
+usr/lib/grub/x86_64-efi/random.mod
+usr/lib/grub/x86_64-efi/random.module
 usr/lib/grub/x86_64-efi/read.mod
 usr/lib/grub/x86_64-efi/read.module
 usr/lib/grub/x86_64-efi/reboot.mod
@@ -827,14 +1009,26 @@ usr/lib/grub/x86_64-efi/serial.mod
 usr/lib/grub/x86_64-efi/serial.module
 usr/lib/grub/x86_64-efi/setjmp.mod
 usr/lib/grub/x86_64-efi/setjmp.module
+usr/lib/grub/x86_64-efi/setjmp_test.mod
+usr/lib/grub/x86_64-efi/setjmp_test.module
 usr/lib/grub/x86_64-efi/setpci.mod
 usr/lib/grub/x86_64-efi/setpci.module
 usr/lib/grub/x86_64-efi/sfs.mod
 usr/lib/grub/x86_64-efi/sfs.module
+usr/lib/grub/x86_64-efi/shift_test.mod
+usr/lib/grub/x86_64-efi/shift_test.module
+usr/lib/grub/x86_64-efi/signature_test.mod
+usr/lib/grub/x86_64-efi/signature_test.module
 usr/lib/grub/x86_64-efi/sleep.mod
 usr/lib/grub/x86_64-efi/sleep.module
+usr/lib/grub/x86_64-efi/sleep_test.mod
+usr/lib/grub/x86_64-efi/sleep_test.module
+usr/lib/grub/x86_64-efi/spkmodem.mod
+usr/lib/grub/x86_64-efi/spkmodem.module
 usr/lib/grub/x86_64-efi/squash4.mod
 usr/lib/grub/x86_64-efi/squash4.module
+usr/lib/grub/x86_64-efi/syslinuxcfg.mod
+usr/lib/grub/x86_64-efi/syslinuxcfg.module
 usr/lib/grub/x86_64-efi/tar.mod
 usr/lib/grub/x86_64-efi/tar.module
 usr/lib/grub/x86_64-efi/terminal.lst
@@ -848,12 +1042,16 @@ usr/lib/grub/x86_64-efi/test_blockarg.mod
 usr/lib/grub/x86_64-efi/test_blockarg.module
 usr/lib/grub/x86_64-efi/testload.mod
 usr/lib/grub/x86_64-efi/testload.module
+usr/lib/grub/x86_64-efi/testspeed.mod
+usr/lib/grub/x86_64-efi/testspeed.module
 usr/lib/grub/x86_64-efi/tftp.mod
 usr/lib/grub/x86_64-efi/tftp.module
 usr/lib/grub/x86_64-efi/tga.mod
 usr/lib/grub/x86_64-efi/tga.module
 usr/lib/grub/x86_64-efi/time.mod
 usr/lib/grub/x86_64-efi/time.module
+usr/lib/grub/x86_64-efi/tr.mod
+usr/lib/grub/x86_64-efi/tr.module
 usr/lib/grub/x86_64-efi/trig.mod
 usr/lib/grub/x86_64-efi/trig.module
 usr/lib/grub/x86_64-efi/true.mod
@@ -862,6 +1060,8 @@ usr/lib/grub/x86_64-efi/udf.mod
 usr/lib/grub/x86_64-efi/udf.module
 usr/lib/grub/x86_64-efi/ufs1.mod
 usr/lib/grub/x86_64-efi/ufs1.module
+usr/lib/grub/x86_64-efi/ufs1_be.mod
+usr/lib/grub/x86_64-efi/ufs1_be.module
 usr/lib/grub/x86_64-efi/ufs2.mod
 usr/lib/grub/x86_64-efi/ufs2.module
 usr/lib/grub/x86_64-efi/uhci.mod
@@ -878,8 +1078,12 @@ usr/lib/grub/x86_64-efi/usbserial_ftdi.mod
 usr/lib/grub/x86_64-efi/usbserial_ftdi.module
 usr/lib/grub/x86_64-efi/usbserial_pl2303.mod
 usr/lib/grub/x86_64-efi/usbserial_pl2303.module
+usr/lib/grub/x86_64-efi/usbserial_usbdebug.mod
+usr/lib/grub/x86_64-efi/usbserial_usbdebug.module
 usr/lib/grub/x86_64-efi/usbtest.mod
 usr/lib/grub/x86_64-efi/usbtest.module
+usr/lib/grub/x86_64-efi/verify.mod
+usr/lib/grub/x86_64-efi/verify.module
 usr/lib/grub/x86_64-efi/video.lst
 usr/lib/grub/x86_64-efi/video.mod
 usr/lib/grub/x86_64-efi/video.module
@@ -887,18 +1091,24 @@ usr/lib/grub/x86_64-efi/video_bochs.mod
 usr/lib/grub/x86_64-efi/video_bochs.module
 usr/lib/grub/x86_64-efi/video_cirrus.mod
 usr/lib/grub/x86_64-efi/video_cirrus.module
+usr/lib/grub/x86_64-efi/video_colors.mod
+usr/lib/grub/x86_64-efi/video_colors.module
 usr/lib/grub/x86_64-efi/video_fb.mod
 usr/lib/grub/x86_64-efi/video_fb.module
 usr/lib/grub/x86_64-efi/videoinfo.mod
 usr/lib/grub/x86_64-efi/videoinfo.module
 usr/lib/grub/x86_64-efi/videotest.mod
 usr/lib/grub/x86_64-efi/videotest.module
+usr/lib/grub/x86_64-efi/videotest_checksum.mod
+usr/lib/grub/x86_64-efi/videotest_checksum.module
 usr/lib/grub/x86_64-efi/xfs.mod
 usr/lib/grub/x86_64-efi/xfs.module
 usr/lib/grub/x86_64-efi/xnu.mod
 usr/lib/grub/x86_64-efi/xnu.module
 usr/lib/grub/x86_64-efi/xnu_uuid.mod
 usr/lib/grub/x86_64-efi/xnu_uuid.module
+usr/lib/grub/x86_64-efi/xnu_uuid_test.mod
+usr/lib/grub/x86_64-efi/xnu_uuid_test.module
 usr/lib/grub/x86_64-efi/xzio.mod
 usr/lib/grub/x86_64-efi/xzio.module
 usr/lib/grub/x86_64-efi/zfs.mod
@@ -917,7 +1127,12 @@ usr/sbin/grub-reboot
 usr/sbin/grub-set-default
 usr/sbin/grub-sparc64-setup
 #usr/share/grub
+#usr/share/grub/ascii.h
+usr/share/grub/ascii.pf2
+usr/share/grub/euro.pf2
 usr/share/grub/grub-mkconfig_lib
+usr/share/grub/unicode.pf2
+#usr/share/grub/widthspec.h
 #usr/share/info/grub-dev.info
 #usr/share/info/grub.info
 #usr/share/locale/ast/LC_MESSAGES/grub.mo
diff --git a/lfs/grub b/lfs/grub
index 8f2436b419..c4391c1128 100644
--- a/lfs/grub
+++ b/lfs/grub
@@ -30,28 +30,24 @@ THISAPP    = grub-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-DIR_APP_EFI= $(DIR_APP)-efi
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = x86_64 i586
 
-EFI = 1
+# Build for which platforms?
+BUILD_PC    = 1
+BUILD_EFI   = $(EFI)
 
-EFI_ARCH = $(MACHINE)-efi
+DIR_APP_PC  = $(DIR_APP)-pc
+DIR_APP_EFI = $(DIR_APP)-efi
 
-ifeq "$(MACHINE)" "i586"
-	EFI_ARCH = i386-efi
-endif
-
-CFLAGS     =
-CXXFLAGS   =
+# Don't use our CFLAGS for boot code
+export HOST_CFLAGS  = $(CFLAGS)
+export HOST_LDFLAGS = $(LDFLAGS)
 
 CONFIGURE_ARGS = \
 	--prefix=/usr \
 	--sysconfdir=/etc \
-	--with-grubdir=grub \
-	--disable-grub-mount \
-	--disable-werror \
-	--program-transform-name=s,grub,grub,
+	--disable-werror
 
 ###############################################################################
 # Top-level Rules
@@ -94,40 +90,38 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) $(DIR_APP_EFI) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-2.00_disable_vga_fallback.patch
-
-ifeq "$(EFI)" "1"
-	cp -av $(DIR_APP) $(DIR_APP_EFI)
-	cd $(DIR_APP_EFI) && ./configure $(CONFIGURE_ARGS) --with-platform=efi
-	cd $(DIR_APP_EFI) && make $(MAKETUNING)
-
-	cd $(DIR_APP_EFI) && ./grub-mkimage \
-		-O $(EFI_ARCH) \
-		-p /EFI/ipfire/grub-efi \
-		-o grub.efi \
-		-d  grub-core part_msdos part_gpt fat ext2 xfs normal chain \
-			boot configfile linux jpeg minicmd loadbios png gzio loadenv \
-			reboot halt serial search font gfxmenu gfxterm echo video all_video \
-			usb minicmd
-endif
 
-	cd $(DIR_APP) && ./configure $(CONFIGURE_ARGS) --with-platform=pc
-	cd $(DIR_APP) && make $(MAKETUNING)
+	# Install unifont
+	cp -v $(DIR_DL)/unifont-7.0.03.pcf.gz $(DIR_APP)/unifont.pcf.gz
 
-ifeq "$(EFI)" "1"
+ifeq "$(BUILD_EFI)" "1"
+	cp -r $(DIR_APP) $(DIR_APP_EFI)
+	cd $(DIR_APP_EFI) && ./configure $(CONFIGURE_ARGS) \
+		--with-platform=efi CFLAGS= LDFLAGS=
+	cd $(DIR_APP_EFI) && make $(MAKETUNING)
 	cd $(DIR_APP_EFI) && make install
 
+	# Install empty configuration file
 	-mkdir -pv /boot/efi/EFI/ipfire/grub-efi
 	touch /boot/efi/EFI/ipfire/grub-efi/grub.cfg
-	install -m 755 $(DIR_APP_EFI)/grub.efi /boot/efi/EFI/ipfire/grub-efi/grub.efi
 endif
 
-	cd $(DIR_APP) && make install
+ifeq "$(BUILD_PC)" "1"
+	cp -r $(DIR_APP) $(DIR_APP_PC)
+	cd $(DIR_APP_PC) && ./configure $(CONFIGURE_ARGS) \
+		--with-platform=pc CFLAGS= LDFLAGS=
+	cd $(DIR_APP_PC) && make $(MAKETUNING)
+	cd $(DIR_APP_PC) && make install
 
+	# Install empty configuration file
 	-mkdir -pv /boot/grub
 	touch /boot/grub/grub.cfg
+endif
+
+	# Install background image
 	install -m 644 $(DIR_SRC)/config/grub2/splash.png /boot/grub/splash.png
 
+	# Install default configuration
 	-mkdir -pv /etc/default
 	install -m 644 $(DIR_SRC)/config/grub2/default /etc/default/grub
 
@@ -135,12 +129,5 @@ endif
 	paxctl -Cmpes /usr/sbin/grub-bios-setup /usr/sbin/grub-probe
 	paxctl -Cmpexs /usr/bin/grub-script-check
 
-	# We don't need to install unifont just to generate a grub2 compatible
-	# font archive for the graphical boot menu. The following command only
-	# converts Latin-1, Latin Extended A+B, Arrows, Box and Block characters.
-	/usr/bin/grub-mkfont --output /boot/grub/unifont.pf2 \
-		--range=0x0000-0x0241,0x2190-0x21FF,0x2500-0x259f \
-		$(DIR_DL)/unifont-7.0.03.pcf.gz
-
-	@rm -rf $(DIR_APP) $(DIR_APP_EFI)
+	@rm -rf $(DIR_APP) $(DIR_APP_PC) $(DIR_APP_EFI)
 	@$(POSTBUILD)