Enhance the flash image to support EFI

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

diff --git a/lfs/grub b/lfs/grub
index 04aaa0b2542b283918f0628e167fdf06588aa3b3..0a6a22517fc7aede2c06c266138a2f41bb9f6186 100644 (file)
--- 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,18 +24,29 @@
 
 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)
+DIR_APP_EFI= $(DIR_APP)-efi
 TARGET     = $(DIR_INFO)/$(THISAPP)
-SUP_ARCH   = i586
+SUP_ARCH   = x86_64 i586
+
+EFI = 1
 
 CFLAGS     =
 CXXFLAGS   =
 
+CONFIGURE_ARGS = \
+       --prefix=/usr \
+       --sysconfdir=/etc \
+       --with-grubdir=grub \
+       --disable-grub-mount \
+       --disable-werror \
+       --program-transform-name=s,grub,grub,
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -46,7 +57,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 = a1043102fbc7bcedbf53e7ee3d17ab91
+$(DL_FILE)_MD5 = 8a4a2a95aac551fb0fba860ceabfa1d3
 unifont-7.0.03.pcf.gz_MD5 = f6903ac8c1caeeb30c1e9a2975028401
 
 install : $(TARGET)
@@ -76,30 +87,47 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       @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
-       cd $(DIR_APP) && \
-               ./configure \
-                       --prefix=/usr \
-                       --sysconfdir=/etc \
-                       --with-platform=pc \
-                       --with-grubdir=grub \
-                       --program-transform-name=s,grub,grub, \
-                       --disable-grub-mount \
-                       --disable-werror
+
+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 i386-efi \
+               -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)
+
+ifeq "$(EFI)" "1"
+       cd $(DIR_APP_EFI) && make install
+
+       -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
 
        -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
@@ -108,5 +136,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --range=0x0000-0x0241,0x2190-0x21FF,0x2500-0x259f \
                $(DIR_DL)/unifont-7.0.03.pcf.gz
 
-       @rm -rf $(DIR_APP)
+       @rm -rf $(DIR_APP) $(DIR_APP_EFI)
        @$(POSTBUILD)