grub: xfs: Accept filesystem with sparse inodes

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

diff --git a/lfs/grub b/lfs/grub
index 51482961350d2c404c06ae95a2afdd6876506c7d..e6131f2f59dd360b9d91b2956eba340a68d68049 100644 (file)
--- a/lfs/grub
+++ b/lfs/grub
@@ -31,10 +31,30 @@ DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-SUP_ARCH   = x86_64 i586
+SUP_ARCH   = aarch64 x86_64 i586
 
-CFLAGS     =
-CXXFLAGS   =
+# 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
@@ -76,40 +96,41 @@ $(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.02_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
-       cd $(DIR_APP) && make $(MAKETUNING)
-       cd $(DIR_APP) && make install
-
+       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
-       ln -svf ../boot/grub/grub.cfg /etc/grub2.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
 
-       # Disable hardening.
-       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)
+       @rm -rf $(DIR_APP) $(DIR_APP_PC) $(DIR_APP_EFI)
        @$(POSTBUILD)