]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - lfs/grub
core133: Ship jansson in update
[ipfire-2.x.git] / lfs / grub
index e6131f2f59dd360b9d91b2956eba340a68d68049..67a9e1002ea4630258613f3d4de205ce0de98138 100644 (file)
--- a/lfs/grub
+++ b/lfs/grub
@@ -100,6 +100,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        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
@@ -115,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