]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
grub: Disable efiemu on PC builds
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 26 Apr 2019 15:10:25 +0000 (16:10 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 26 Apr 2019 15:19:42 +0000 (16:19 +0100)
This won't compile with GCC 8 and we do not need it

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
config/rootfiles/common/i586/grub
config/rootfiles/common/x86_64/grub
lfs/grub

index bc28d45931e5c99b99b89383892cbb7ea69563c8..d8bd621131c8d78bfd0ca9cef1b0d9041cc80df0 100644 (file)
@@ -146,8 +146,6 @@ usr/lib/grub/i386-pc
 #usr/lib/grub/i386-pc/drivemap.module
 #usr/lib/grub/i386-pc/echo.mod
 #usr/lib/grub/i386-pc/echo.module
-#usr/lib/grub/i386-pc/efiemu.mod
-#usr/lib/grub/i386-pc/efiemu.module
 #usr/lib/grub/i386-pc/ehci.mod
 #usr/lib/grub/i386-pc/ehci.module
 #usr/lib/grub/i386-pc/elf.mod
index d64a9881917e45745db0bfc4d78918c8aa731fd6..c73e339863a2687d68c82a9bd826c33b3562b94e 100644 (file)
@@ -146,10 +146,6 @@ usr/lib/grub/i386-pc/drivemap.mod
 usr/lib/grub/i386-pc/drivemap.module
 usr/lib/grub/i386-pc/echo.mod
 usr/lib/grub/i386-pc/echo.module
-usr/lib/grub/i386-pc/efiemu.mod
-usr/lib/grub/i386-pc/efiemu.module
-usr/lib/grub/i386-pc/efiemu32.o
-usr/lib/grub/i386-pc/efiemu64.o
 usr/lib/grub/i386-pc/ehci.mod
 usr/lib/grub/i386-pc/ehci.module
 usr/lib/grub/i386-pc/elf.mod
index e6131f2f59dd360b9d91b2956eba340a68d68049..8e4aab22345a0bc320967745a85022fda316ea84 100644 (file)
--- a/lfs/grub
+++ b/lfs/grub
@@ -115,7 +115,7 @@ endif
 ifeq "$(BUILD_PC)" "1"
        cp -r $(DIR_APP) $(DIR_APP_PC)
        cd $(DIR_APP_PC) && ./configure $(CONFIGURE_ARGS) \
-               --with-platform=pc CFLAGS= LDFLAGS=
+               --with-platform=pc --disable-efiemu CFLAGS= LDFLAGS=
        cd $(DIR_APP_PC) && make $(MAKETUNING)
        cd $(DIR_APP_PC) && make install