slang: revert parallelized build

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

diff --git a/lfs/grub b/lfs/grub
index 2b0544bd7c053cac6a754d2d2168b62f5410e5bc..e6131f2f59dd360b9d91b2956eba340a68d68049 100644 (file)
--- a/lfs/grub
+++ b/lfs/grub
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  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,26 +24,50 @@
 
 include Config
 
-VER        = 0.97
+VER        = 2.02
 
 THISAPP    = grub-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-SUP_ARCH   = i586
-CFLAGS     =
-CXXFLAGS   =
+SUP_ARCH   = aarch64 x86_64 i586
+
+# Build for which platforms?
+ifeq "$(BUILD_ARCH)" "i586"
+       BUILD_PC = 1
+endif
+
+ifeq "$(BUILD_ARCH)" "x86_64"
+       BUILD_PC = 1
+endif
+
+BUILD_EFI = $(EFI)
+
+DIR_APP_PC  = $(DIR_APP)-pc
+DIR_APP_EFI = $(DIR_APP)-efi
+
+# Don't use our CFLAGS for boot code
+export HOST_CFLAGS  = $(CFLAGS)
+export HOST_LDFLAGS = $(LDFLAGS)
+
+CONFIGURE_ARGS = \
+       --prefix=/usr \
+       --sysconfdir=/etc \
+       --disable-werror
 
 ###############################################################################
 # 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 = cd3f3eb54446be6003156158d51f4884
+$(DL_FILE)_MD5 = 8a4a2a95aac551fb0fba860ceabfa1d3
+unifont-7.0.03.pcf.gz_MD5 = f6903ac8c1caeeb30c1e9a2975028401
 
 install : $(TARGET)
 
@@ -72,31 +96,41 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-
-       # Applying patches.
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-gentoo-14.patch
-       cd $(DIR_APP) && autoreconf
-       cd $(DIR_APP) && autoconf
-
-       # Build.
-       cd $(DIR_APP) && CFLAGS="$(CFLAGS)" ./configure --prefix=/usr \
-               --disable-auto-linux-mem-opt
-       cd $(DIR_APP) && make $(MAKETUNING)
-       cd $(DIR_APP) && make install
-
-       # grub files
-       mkdir -vp /boot/grub
-       cp -v /usr/lib/grub/i386-pc/stage{1,2} /boot/grub
-       for i in $(DIR_SRC)/config/grub/*; do \
-           [ -f $$i ] && cp -f $$i /boot/grub; \
-       done
-
-       # generate default file
-       grub-set-default 0
-
-       # Disable PaX mprotect for grub
-       paxctl -m /usr/sbin/grub
-
-       @rm -rf $(DIR_APP)
+       @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.02_disable_vga_fallback.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-2.02-xfs-accept-filesystem-with-sparse-inodes.patch
+
+       # Install unifont
+       cp -v $(DIR_DL)/unifont-7.0.03.pcf.gz $(DIR_APP)/unifont.pcf.gz
+
+ifeq "$(BUILD_EFI)" "1"
+       cp -r $(DIR_APP) $(DIR_APP_EFI)
+       cd $(DIR_APP_EFI) && ./configure $(CONFIGURE_ARGS) \
+               --with-platform=efi CFLAGS= LDFLAGS=
+       cd $(DIR_APP_EFI) && make $(MAKETUNING)
+       cd $(DIR_APP_EFI) && make install
+endif
+
+ifeq "$(BUILD_PC)" "1"
+       cp -r $(DIR_APP) $(DIR_APP_PC)
+       cd $(DIR_APP_PC) && ./configure $(CONFIGURE_ARGS) \
+               --with-platform=pc CFLAGS= LDFLAGS=
+       cd $(DIR_APP_PC) && make $(MAKETUNING)
+       cd $(DIR_APP_PC) && make install
+
+       # Install empty configuration file
+       -mkdir -pv /boot/grub
+       touch /boot/grub/grub.cfg
+endif
+
+       # Install background image
+       -mkdir -pv /boot/grub
+       install -m 644 $(DIR_SRC)/config/grub2/splash.png /boot/grub/splash.png
+
+       # Install default configuration
+       -mkdir -pv /etc/default
+       install -m 644 $(DIR_SRC)/config/grub2/default /etc/default/grub
+
+       @rm -rf $(DIR_APP) $(DIR_APP_PC) $(DIR_APP_EFI)
        @$(POSTBUILD)