grub: update to 2.06

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2021-07-01 09:06:26 +02:00
parent 97500acdb8
commit 26553bec8a
9 changed files with 54 additions and 14 deletions

View File

@@ -8,6 +8,7 @@ etc/grub.d/00_header
etc/grub.d/10_linux
etc/grub.d/20_linux_xen
etc/grub.d/30_os-prober
etc/grub.d/30_uefi-firmware
etc/grub.d/40_custom
etc/grub.d/41_custom
#etc/grub.d/README
@@ -38,6 +39,8 @@ usr/lib/grub/arm64-efi/affs.mod
usr/lib/grub/arm64-efi/affs.module
usr/lib/grub/arm64-efi/afs.mod
usr/lib/grub/arm64-efi/afs.module
usr/lib/grub/arm64-efi/afsplitter.mod
usr/lib/grub/arm64-efi/afsplitter.module
usr/lib/grub/arm64-efi/all_video.mod
usr/lib/grub/arm64-efi/all_video.module
usr/lib/grub/arm64-efi/archelp.mod
@@ -225,6 +228,8 @@ usr/lib/grub/arm64-efi/jfs.mod
usr/lib/grub/arm64-efi/jfs.module
usr/lib/grub/arm64-efi/jpeg.mod
usr/lib/grub/arm64-efi/jpeg.module
usr/lib/grub/arm64-efi/json.mod
usr/lib/grub/arm64-efi/json.module
usr/lib/grub/arm64-efi/kernel.exec
usr/lib/grub/arm64-efi/kernel.img
usr/lib/grub/arm64-efi/keystatus.mod
@@ -253,6 +258,8 @@ usr/lib/grub/arm64-efi/lssal.mod
usr/lib/grub/arm64-efi/lssal.module
usr/lib/grub/arm64-efi/luks.mod
usr/lib/grub/arm64-efi/luks.module
usr/lib/grub/arm64-efi/luks2.mod
usr/lib/grub/arm64-efi/luks2.module
usr/lib/grub/arm64-efi/lvm.mod
usr/lib/grub/arm64-efi/lvm.module
usr/lib/grub/arm64-efi/lzopio.mod
@@ -397,6 +404,8 @@ usr/lib/grub/arm64-efi/sleep.mod
usr/lib/grub/arm64-efi/sleep.module
usr/lib/grub/arm64-efi/sleep_test.mod
usr/lib/grub/arm64-efi/sleep_test.module
usr/lib/grub/arm64-efi/smbios.mod
usr/lib/grub/arm64-efi/smbios.module
usr/lib/grub/arm64-efi/squash4.mod
usr/lib/grub/arm64-efi/squash4.module
usr/lib/grub/arm64-efi/strtoull_test.mod
@@ -424,6 +433,8 @@ usr/lib/grub/arm64-efi/tga.mod
usr/lib/grub/arm64-efi/tga.module
usr/lib/grub/arm64-efi/time.mod
usr/lib/grub/arm64-efi/time.module
usr/lib/grub/arm64-efi/tpm.mod
usr/lib/grub/arm64-efi/tpm.module
usr/lib/grub/arm64-efi/tr.mod
usr/lib/grub/arm64-efi/tr.module
usr/lib/grub/arm64-efi/trig.mod
@@ -438,8 +449,6 @@ usr/lib/grub/arm64-efi/ufs1_be.mod
usr/lib/grub/arm64-efi/ufs1_be.module
usr/lib/grub/arm64-efi/ufs2.mod
usr/lib/grub/arm64-efi/ufs2.module
usr/lib/grub/arm64-efi/verifiers.mod
usr/lib/grub/arm64-efi/verifiers.module
usr/lib/grub/arm64-efi/video.lst
usr/lib/grub/arm64-efi/video.mod
usr/lib/grub/arm64-efi/video.module
@@ -489,6 +498,8 @@ usr/share/grub/unicode.pf2
#usr/share/grub/widthspec.h
#usr/share/info/grub-dev.info
#usr/share/info/grub.info
#usr/share/info/grub.info-1
#usr/share/info/grub.info-2
#usr/share/locale/ast/LC_MESSAGES/grub.mo
#usr/share/locale/ca/LC_MESSAGES/grub.mo
#usr/share/locale/da/LC_MESSAGES/grub.mo
@@ -526,6 +537,7 @@ usr/share/grub/unicode.pf2
#usr/share/locale/it/LC_MESSAGES/grub.mo
#usr/share/locale/ja/LC_MESSAGES/grub.mo
#usr/share/locale/ko/LC_MESSAGES/grub.mo
#usr/share/locale/lg/LC_MESSAGES/grub.mo
#usr/share/locale/lt/LC_MESSAGES/grub.mo
#usr/share/locale/nb/LC_MESSAGES/grub.mo
#usr/share/locale/nl/LC_MESSAGES/grub.mo

View File

@@ -9,6 +9,7 @@ etc/grub.d/00_header
etc/grub.d/10_linux
etc/grub.d/20_linux_xen
etc/grub.d/30_os-prober
etc/grub.d/30_uefi-firmware
etc/grub.d/40_custom
etc/grub.d/41_custom
#etc/grub.d/README
@@ -39,6 +40,8 @@ usr/lib/grub/i386-pc/affs.mod
usr/lib/grub/i386-pc/affs.module
usr/lib/grub/i386-pc/afs.mod
usr/lib/grub/i386-pc/afs.module
usr/lib/grub/i386-pc/afsplitter.mod
usr/lib/grub/i386-pc/afsplitter.module
usr/lib/grub/i386-pc/ahci.mod
usr/lib/grub/i386-pc/ahci.module
usr/lib/grub/i386-pc/all_video.mod
@@ -270,6 +273,8 @@ usr/lib/grub/i386-pc/jfs.mod
usr/lib/grub/i386-pc/jfs.module
usr/lib/grub/i386-pc/jpeg.mod
usr/lib/grub/i386-pc/jpeg.module
usr/lib/grub/i386-pc/json.mod
usr/lib/grub/i386-pc/json.module
usr/lib/grub/i386-pc/kernel.exec
usr/lib/grub/i386-pc/kernel.img
usr/lib/grub/i386-pc/keylayouts.mod
@@ -304,6 +309,8 @@ usr/lib/grub/i386-pc/lspci.mod
usr/lib/grub/i386-pc/lspci.module
usr/lib/grub/i386-pc/luks.mod
usr/lib/grub/i386-pc/luks.module
usr/lib/grub/i386-pc/luks2.mod
usr/lib/grub/i386-pc/luks2.module
usr/lib/grub/i386-pc/lvm.mod
usr/lib/grub/i386-pc/lvm.module
usr/lib/grub/i386-pc/lzma_decompress.image
@@ -490,6 +497,8 @@ usr/lib/grub/i386-pc/sleep.mod
usr/lib/grub/i386-pc/sleep.module
usr/lib/grub/i386-pc/sleep_test.mod
usr/lib/grub/i386-pc/sleep_test.module
usr/lib/grub/i386-pc/smbios.mod
usr/lib/grub/i386-pc/smbios.module
usr/lib/grub/i386-pc/spkmodem.mod
usr/lib/grub/i386-pc/spkmodem.module
usr/lib/grub/i386-pc/squash4.mod
@@ -555,8 +564,6 @@ usr/lib/grub/i386-pc/usbtest.mod
usr/lib/grub/i386-pc/usbtest.module
usr/lib/grub/i386-pc/vbe.mod
usr/lib/grub/i386-pc/vbe.module
usr/lib/grub/i386-pc/verifiers.mod
usr/lib/grub/i386-pc/verifiers.module
usr/lib/grub/i386-pc/vga.mod
usr/lib/grub/i386-pc/vga.module
usr/lib/grub/i386-pc/vga_text.mod
@@ -616,6 +623,8 @@ usr/share/grub/unicode.pf2
#usr/share/grub/widthspec.h
#usr/share/info/grub-dev.info
#usr/share/info/grub.info
#usr/share/info/grub.info-1
#usr/share/info/grub.info-2
#usr/share/locale/ast/LC_MESSAGES/grub.mo
#usr/share/locale/ca/LC_MESSAGES/grub.mo
#usr/share/locale/da/LC_MESSAGES/grub.mo
@@ -653,6 +662,7 @@ usr/share/grub/unicode.pf2
#usr/share/locale/it/LC_MESSAGES/grub.mo
#usr/share/locale/ja/LC_MESSAGES/grub.mo
#usr/share/locale/ko/LC_MESSAGES/grub.mo
#usr/share/locale/lg/LC_MESSAGES/grub.mo
#usr/share/locale/lt/LC_MESSAGES/grub.mo
#usr/share/locale/nb/LC_MESSAGES/grub.mo
#usr/share/locale/nl/LC_MESSAGES/grub.mo

View File

@@ -9,6 +9,7 @@ etc/grub.d/00_header
etc/grub.d/10_linux
etc/grub.d/20_linux_xen
etc/grub.d/30_os-prober
etc/grub.d/30_uefi-firmware
etc/grub.d/40_custom
etc/grub.d/41_custom
#etc/grub.d/README
@@ -39,6 +40,8 @@ usr/lib/grub/i386-pc/affs.mod
usr/lib/grub/i386-pc/affs.module
usr/lib/grub/i386-pc/afs.mod
usr/lib/grub/i386-pc/afs.module
usr/lib/grub/i386-pc/afsplitter.mod
usr/lib/grub/i386-pc/afsplitter.module
usr/lib/grub/i386-pc/ahci.mod
usr/lib/grub/i386-pc/ahci.module
usr/lib/grub/i386-pc/all_video.mod
@@ -270,6 +273,8 @@ usr/lib/grub/i386-pc/jfs.mod
usr/lib/grub/i386-pc/jfs.module
usr/lib/grub/i386-pc/jpeg.mod
usr/lib/grub/i386-pc/jpeg.module
usr/lib/grub/i386-pc/json.mod
usr/lib/grub/i386-pc/json.module
usr/lib/grub/i386-pc/kernel.exec
usr/lib/grub/i386-pc/kernel.img
usr/lib/grub/i386-pc/keylayouts.mod
@@ -304,6 +309,8 @@ usr/lib/grub/i386-pc/lspci.mod
usr/lib/grub/i386-pc/lspci.module
usr/lib/grub/i386-pc/luks.mod
usr/lib/grub/i386-pc/luks.module
usr/lib/grub/i386-pc/luks2.mod
usr/lib/grub/i386-pc/luks2.module
usr/lib/grub/i386-pc/lvm.mod
usr/lib/grub/i386-pc/lvm.module
usr/lib/grub/i386-pc/lzma_decompress.image
@@ -490,6 +497,8 @@ usr/lib/grub/i386-pc/sleep.mod
usr/lib/grub/i386-pc/sleep.module
usr/lib/grub/i386-pc/sleep_test.mod
usr/lib/grub/i386-pc/sleep_test.module
usr/lib/grub/i386-pc/smbios.mod
usr/lib/grub/i386-pc/smbios.module
usr/lib/grub/i386-pc/spkmodem.mod
usr/lib/grub/i386-pc/spkmodem.module
usr/lib/grub/i386-pc/squash4.mod
@@ -555,8 +564,6 @@ usr/lib/grub/i386-pc/usbtest.mod
usr/lib/grub/i386-pc/usbtest.module
usr/lib/grub/i386-pc/vbe.mod
usr/lib/grub/i386-pc/vbe.module
usr/lib/grub/i386-pc/verifiers.mod
usr/lib/grub/i386-pc/verifiers.module
usr/lib/grub/i386-pc/vga.mod
usr/lib/grub/i386-pc/vga.module
usr/lib/grub/i386-pc/vga_text.mod
@@ -607,6 +614,8 @@ usr/lib/grub/x86_64-efi/affs.mod
usr/lib/grub/x86_64-efi/affs.module
usr/lib/grub/x86_64-efi/afs.mod
usr/lib/grub/x86_64-efi/afs.module
usr/lib/grub/x86_64-efi/afsplitter.mod
usr/lib/grub/x86_64-efi/afsplitter.module
usr/lib/grub/x86_64-efi/ahci.mod
usr/lib/grub/x86_64-efi/ahci.module
usr/lib/grub/x86_64-efi/all_video.mod
@@ -828,6 +837,8 @@ usr/lib/grub/x86_64-efi/jfs.mod
usr/lib/grub/x86_64-efi/jfs.module
usr/lib/grub/x86_64-efi/jpeg.mod
usr/lib/grub/x86_64-efi/jpeg.module
usr/lib/grub/x86_64-efi/json.mod
usr/lib/grub/x86_64-efi/json.module
usr/lib/grub/x86_64-efi/kernel.exec
usr/lib/grub/x86_64-efi/kernel.img
usr/lib/grub/x86_64-efi/keylayouts.mod
@@ -868,6 +879,8 @@ usr/lib/grub/x86_64-efi/lssal.mod
usr/lib/grub/x86_64-efi/lssal.module
usr/lib/grub/x86_64-efi/luks.mod
usr/lib/grub/x86_64-efi/luks.module
usr/lib/grub/x86_64-efi/luks2.mod
usr/lib/grub/x86_64-efi/luks2.module
usr/lib/grub/x86_64-efi/lvm.mod
usr/lib/grub/x86_64-efi/lvm.module
usr/lib/grub/x86_64-efi/lzopio.mod
@@ -1030,14 +1043,14 @@ usr/lib/grub/x86_64-efi/sfs.mod
usr/lib/grub/x86_64-efi/sfs.module
usr/lib/grub/x86_64-efi/shift_test.mod
usr/lib/grub/x86_64-efi/shift_test.module
usr/lib/grub/x86_64-efi/shim_lock.mod
usr/lib/grub/x86_64-efi/shim_lock.module
usr/lib/grub/x86_64-efi/signature_test.mod
usr/lib/grub/x86_64-efi/signature_test.module
usr/lib/grub/x86_64-efi/sleep.mod
usr/lib/grub/x86_64-efi/sleep.module
usr/lib/grub/x86_64-efi/sleep_test.mod
usr/lib/grub/x86_64-efi/sleep_test.module
usr/lib/grub/x86_64-efi/smbios.mod
usr/lib/grub/x86_64-efi/smbios.module
usr/lib/grub/x86_64-efi/spkmodem.mod
usr/lib/grub/x86_64-efi/spkmodem.module
usr/lib/grub/x86_64-efi/squash4.mod
@@ -1101,8 +1114,6 @@ usr/lib/grub/x86_64-efi/usbserial_usbdebug.mod
usr/lib/grub/x86_64-efi/usbserial_usbdebug.module
usr/lib/grub/x86_64-efi/usbtest.mod
usr/lib/grub/x86_64-efi/usbtest.module
usr/lib/grub/x86_64-efi/verifiers.mod
usr/lib/grub/x86_64-efi/verifiers.module
usr/lib/grub/x86_64-efi/video.lst
usr/lib/grub/x86_64-efi/video.mod
usr/lib/grub/x86_64-efi/video.module
@@ -1158,6 +1169,8 @@ usr/share/grub/unicode.pf2
#usr/share/grub/widthspec.h
#usr/share/info/grub-dev.info
#usr/share/info/grub.info
#usr/share/info/grub.info-1
#usr/share/info/grub.info-2
#usr/share/locale/ast/LC_MESSAGES/grub.mo
#usr/share/locale/ca/LC_MESSAGES/grub.mo
#usr/share/locale/da/LC_MESSAGES/grub.mo
@@ -1195,6 +1208,7 @@ usr/share/grub/unicode.pf2
#usr/share/locale/it/LC_MESSAGES/grub.mo
#usr/share/locale/ja/LC_MESSAGES/grub.mo
#usr/share/locale/ko/LC_MESSAGES/grub.mo
#usr/share/locale/lg/LC_MESSAGES/grub.mo
#usr/share/locale/lt/LC_MESSAGES/grub.mo
#usr/share/locale/nb/LC_MESSAGES/grub.mo
#usr/share/locale/nl/LC_MESSAGES/grub.mo

View File

@@ -0,0 +1 @@
../../../../common/aarch64/grub

View File

@@ -0,0 +1 @@
../../../../common/i586/grub

View File

@@ -1 +0,0 @@
../../../../common/i586/openssl-sse2

View File

@@ -0,0 +1 @@
../../../../common/x86_64/grub

View File

@@ -138,6 +138,9 @@ touch /var/run/need_reboot
/etc/init.d/fireinfo start
sendprofile
# Install updated grub
/usr/bin/install-bootloader
# Update grub config to display new core version
if [ -e /boot/grub/grub.cfg ]; then
grub-mkconfig -o /boot/grub/grub.cfg

View File

@@ -24,7 +24,7 @@
include Config
VER = 2.04
VER = 2.06
THISAPP = grub-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -66,7 +66,7 @@ objects = $(DL_FILE) \
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
unifont-7.0.03.pcf.gz = $(DL_FROM)/unifont-7.0.03.pcf.gz
$(DL_FILE)_MD5 = 5aaca6713b47ca2456d8324a58755ac7
$(DL_FILE)_MD5 = cf0fd928b1e5479c8108ee52cb114363
unifont-7.0.03.pcf.gz_MD5 = f6903ac8c1caeeb30c1e9a2975028401
install : $(TARGET)
@@ -98,7 +98,6 @@ $(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/grub-2.04-BootHole.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub/grub-2.02_disable_vga_fallback.patch
cd $(DIR_APP) && autoreconf -vfi