core133: Ship jansson in update

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

diff --git a/lfs/grub b/lfs/grub
index b51566df39c7c2e9634685b8926b16041f8967de..67a9e1002ea4630258613f3d4de205ce0de98138 100644 (file)
--- a/lfs/grub
+++ b/lfs/grub
@@ -99,6 +99,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @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
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-2.02-fix-packed-not-aligned-error-on-gcc-8.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-2.02-X86_64_PLT32.patch
 
        # Install unifont
        cp -v $(DIR_DL)/unifont-7.0.03.pcf.gz $(DIR_APP)/unifont.pcf.gz
@@ -114,7 +117,7 @@ endif
 ifeq "$(BUILD_PC)" "1"
        cp -r $(DIR_APP) $(DIR_APP_PC)
        cd $(DIR_APP_PC) && ./configure $(CONFIGURE_ARGS) \
-               --with-platform=pc CFLAGS= LDFLAGS=
+               --with-platform=pc --disable-efiemu CFLAGS= LDFLAGS=
        cd $(DIR_APP_PC) && make $(MAKETUNING)
        cd $(DIR_APP_PC) && make install
 
@@ -131,9 +134,5 @@ endif
        -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)