fireinfo: Update to 2.2.0

[people/pmueller/ipfire-2.x.git] / lfs / grub

diff --git a/lfs/grub b/lfs/grub
index 51bbc78599ec105fcf9af541802556cce86b3a93..811c2f745e267e5ff6c246b66bc5f2196e12b780 100644 (file)
--- a/lfs/grub
+++ b/lfs/grub
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.02
+VER        = 2.04
 
 THISAPP    = grub-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -66,7 +66,7 @@ objects = $(DL_FILE) \
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 unifont-7.0.03.pcf.gz = $(DL_FROM)/unifont-7.0.03.pcf.gz
 
-$(DL_FILE)_MD5 = 8a4a2a95aac551fb0fba860ceabfa1d3
+$(DL_FILE)_MD5 = 5aaca6713b47ca2456d8324a58755ac7
 unifont-7.0.03.pcf.gz_MD5 = f6903ac8c1caeeb30c1e9a2975028401
 
 install : $(TARGET)
@@ -98,6 +98,10 @@ $(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/grub-2.04-BootHole.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-2.02_disable_vga_fallback.patch
+       cd $(DIR_APP) && autoreconf -vfi
+
        # Install unifont
        cp -v $(DIR_DL)/unifont-7.0.03.pcf.gz $(DIR_APP)/unifont.pcf.gz
 
@@ -112,7 +116,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
 
@@ -129,9 +133,5 @@ endif
        -mkdir -pv /etc/default
        install -m 644 $(DIR_SRC)/config/grub2/default /etc/default/grub
 
-       # Disable hardening.
-       paxctl -Cmpes /usr/sbin/grub-bios-setup /usr/sbin/grub-probe
-       paxctl -Cmpexs /usr/bin/grub-script-check
-
        @rm -rf $(DIR_APP) $(DIR_APP_PC) $(DIR_APP_EFI)
        @$(POSTBUILD)