X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fgrub;h=51482961350d2c404c06ae95a2afdd6876506c7d;hb=be5a22bf095c5cd2b23694218983fd619a2cdce2;hp=23f6dd3fd25fdc86db2a04c6b102bb089c8a4f8e;hpb=aa7f55b2dfab3194bbb41bfee671b122eda26da4;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/grub b/lfs/grub
index 23f6dd3fd2..5148296135 100644
--- a/lfs/grub
+++ b/lfs/grub
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2014  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  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,14 +24,14 @@
 
 include Config
 
-VER        = 2.00
+VER        = 2.02
 
 THISAPP    = grub-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-SUP_ARCH   = i586
+SUP_ARCH   = x86_64 i586
 
 CFLAGS     =
 CXXFLAGS   =
@@ -40,11 +40,14 @@ CXXFLAGS   =
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) \
+	unifont-7.0.03.pcf.gz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+unifont-7.0.03.pcf.gz = $(DL_FROM)/unifont-7.0.03.pcf.gz
 
-$(DL_FILE)_MD5 = a1043102fbc7bcedbf53e7ee3d17ab91
+$(DL_FILE)_MD5 = 8a4a2a95aac551fb0fba860ceabfa1d3
+unifont-7.0.03.pcf.gz_MD5 = f6903ac8c1caeeb30c1e9a2975028401
 
 install : $(TARGET)
 
@@ -74,6 +77,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-2.02_disable_vga_fallback.patch
+
 	cd $(DIR_APP) && \
 		./configure \
 			--prefix=/usr \
@@ -89,12 +95,21 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	-mkdir -pv /boot/grub
 	touch /boot/grub/grub.cfg
 	ln -svf ../boot/grub/grub.cfg /etc/grub2.cfg
+	install -m 644 $(DIR_SRC)/config/grub2/splash.png /boot/grub/splash.png
 
 	-mkdir -pv /etc/default
 	install -m 644 $(DIR_SRC)/config/grub2/default /etc/default/grub
 
 	# Disable hardening.
-	paxctl -mpes /usr/sbin/grub-bios-setup /usr/sbin/grub-probe
+	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)
 	@$(POSTBUILD)