grub: xfs: Accept filesystem with sparse inodes

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

diff --git a/lfs/grub b/lfs/grub
index c4391c11289d950e59b552663e57bfdf437d5253..e6131f2f59dd360b9d91b2956eba340a68d68049 100644 (file)
--- a/lfs/grub
+++ b/lfs/grub
@@ -31,11 +31,18 @@ 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
 
 # Build for which platforms?
-BUILD_PC    = 1
-BUILD_EFI   = $(EFI)
+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
@@ -91,6 +98,9 @@ $(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-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
 
@@ -100,10 +110,6 @@ ifeq "$(BUILD_EFI)" "1"
                --with-platform=efi CFLAGS= LDFLAGS=
        cd $(DIR_APP_EFI) && make $(MAKETUNING)
        cd $(DIR_APP_EFI) && make install
-
-       # Install empty configuration file
-       -mkdir -pv /boot/efi/EFI/ipfire/grub-efi
-       touch /boot/efi/EFI/ipfire/grub-efi/grub.cfg
 endif
 
 ifeq "$(BUILD_PC)" "1"
@@ -119,15 +125,12 @@ ifeq "$(BUILD_PC)" "1"
 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
-
        @rm -rf $(DIR_APP) $(DIR_APP_PC) $(DIR_APP_EFI)
        @$(POSTBUILD)