From 452d2b6eaa31c1e0aee0bc1da61ebe5cb5538710 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 26 Apr 2019 16:10:25 +0100 Subject: [PATCH] grub: Disable efiemu on PC builds This won't compile with GCC 8 and we do not need it Signed-off-by: Michael Tremer --- config/rootfiles/common/i586/grub | 2 -- config/rootfiles/common/x86_64/grub | 4 ---- lfs/grub | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/config/rootfiles/common/i586/grub b/config/rootfiles/common/i586/grub index bc28d45931..d8bd621131 100644 --- a/config/rootfiles/common/i586/grub +++ b/config/rootfiles/common/i586/grub @@ -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 diff --git a/config/rootfiles/common/x86_64/grub b/config/rootfiles/common/x86_64/grub index d64a988191..c73e339863 100644 --- a/config/rootfiles/common/x86_64/grub +++ b/config/rootfiles/common/x86_64/grub @@ -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 diff --git a/lfs/grub b/lfs/grub index e6131f2f59..8e4aab2234 100644 --- 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 -- 2.39.5