From 977e74007aee12b8fcf0d6ff182d022b429ee711 Mon Sep 17 00:00:00 2001 From: Christopher Co <35273088+christopherco@users.noreply.github.com> Date: Thu, 10 Feb 2022 11:48:26 -0800 Subject: [PATCH] grub2: Update to 2.06 and include tftp support (#2174) * grub2: Update to 2.06 release * grub2: Add efinet and tftp modules to grub efi binary Signed-off-by: Chris Co --- .../grub2-efi-binary-signed.spec | 7 +++++-- SPECS/grub2/grub2.signatures.json | 2 +- SPECS/grub2/grub2.spec | 16 ++++++++++------ cgmanifest.json | 4 ++-- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/SPECS-SIGNED/grub2-efi-binary-signed/grub2-efi-binary-signed.spec b/SPECS-SIGNED/grub2-efi-binary-signed/grub2-efi-binary-signed.spec index 12fcd6c986..e8d5351aa9 100644 --- a/SPECS-SIGNED/grub2-efi-binary-signed/grub2-efi-binary-signed.spec +++ b/SPECS-SIGNED/grub2-efi-binary-signed/grub2-efi-binary-signed.spec @@ -9,8 +9,8 @@ %endif Summary: Signed GRand Unified Bootloader for %{buildarch} systems Name: grub2-efi-binary-signed-%{buildarch} -Version: 2.06~rc1 -Release: 8%{?dist} +Version: 2.06 +Release: 1%{?dist} License: GPLv3+ Vendor: Microsoft Corporation Distribution: Mariner @@ -61,6 +61,9 @@ cp %{SOURCE1} %{buildroot}/boot/efi/EFI/BOOT/%{grubefiname} /boot/efi/EFI/BOOT/%{grubefiname} %changelog +* Wed Feb 09 2022 Chris Co - 2.06-1 +- Update to 2.06 + * Tue Feb 08 2022 Chris Co - 2.06~rc1-8 - Bump release number to match grub release number - License verified diff --git a/SPECS/grub2/grub2.signatures.json b/SPECS/grub2/grub2.signatures.json index 7df2edecc6..27fda835a2 100644 --- a/SPECS/grub2/grub2.signatures.json +++ b/SPECS/grub2/grub2.signatures.json @@ -1,7 +1,7 @@ { "Signatures": { "gnulib-d271f868a8df9bbec29049d01e056481b7a1a263.tar.gz": "4e23415ae2977ffca15e07419ceff3e9334d0369eafc9e7ae2578f8dd9a4839c", - "grub-2.06-rc1.tar.gz": "47ce23a83d3733c954b3f7875b0cc7c297618be5fa07aa47f346f1a35ce2832e", + "grub-2.06.tar.gz": "660eaa2355a4045d8d0cdb5765169d1cad9912ec07873b86c9c6d55dbaa9dfca", "sbat.csv.in": "dc2ec1f12c4ff3167e5168d4ed8c908913bc70b8ce2e5faf790405b3dc1cf8e8" } } \ No newline at end of file diff --git a/SPECS/grub2/grub2.spec b/SPECS/grub2/grub2.spec index 0aacdcd838..2b5580f898 100644 --- a/SPECS/grub2/grub2.spec +++ b/SPECS/grub2/grub2.spec @@ -5,14 +5,14 @@ %global gnulibversion d271f868a8df9bbec29049d01e056481b7a1a263 Summary: GRand Unified Bootloader Name: grub2 -Version: 2.06~rc1 -Release: 8%{?dist} +Version: 2.06 +Release: 1%{?dist} License: GPLv3+ Vendor: Microsoft Corporation Distribution: Mariner Group: Applications/System URL: https://www.gnu.org/software/grub -Source0: https://git.savannah.gnu.org/cgit/grub.git/snapshot/grub-2.06-rc1.tar.gz +Source0: https://git.savannah.gnu.org/cgit/grub.git/snapshot/grub-%{version}.tar.gz Source1: https://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-%{gnulibversion}.tar.gz Source2: sbat.csv.in # Incorporate relevant patches from Fedora 34 @@ -142,7 +142,7 @@ GRUB UEFI bootloader binaries LDFLAGS="`echo " %{build_ldflags} " | sed 's#-Wl,-dT,/usr/src/mariner/BUILD/module_info.ld##'`" export LDFLAGS -%autosetup -p1 -n grub-2.06-rc1 +%autosetup -p1 -n grub-2.06 cp %{SOURCE1} gnulib-%{gnulibversion}.tar.gz tar -zxf gnulib-%{gnulibversion}.tar.gz mv gnulib-%{gnulibversion} gnulib @@ -239,10 +239,10 @@ cat ./sbat.csv # Generate grub efi image install -d %{buildroot}%{_datadir}/grub2-efi %ifarch x86_64 -./install-for-efi/usr/bin/grub2-mkimage -d ./install-for-efi/usr/lib/grub/x86_64-efi/ --sbat ./sbat.csv -o %{buildroot}%{_datadir}/grub2-efi/grubx64.efi -p /boot/grub2 -O x86_64-efi fat iso9660 part_gpt part_msdos normal boot linux configfile loopback chain efifwsetup efi_gop efi_uga ls search search_label search_fs_uuid search_fs_file gfxterm gfxterm_background gfxterm_menu test all_video loadenv exfat ext2 udf halt gfxmenu png tga lsefi help probe echo lvm cryptodisk luks gcry_rijndael gcry_sha512 tpm +./install-for-efi/usr/bin/grub2-mkimage -d ./install-for-efi/usr/lib/grub/x86_64-efi/ --sbat ./sbat.csv -o %{buildroot}%{_datadir}/grub2-efi/grubx64.efi -p /boot/grub2 -O x86_64-efi fat iso9660 part_gpt part_msdos normal boot linux configfile loopback chain efifwsetup efi_gop efi_uga ls search search_label search_fs_uuid search_fs_file gfxterm gfxterm_background gfxterm_menu test all_video loadenv exfat ext2 udf halt gfxmenu png tga lsefi help probe echo lvm cryptodisk luks gcry_rijndael gcry_sha512 tpm efinet tftp %endif %ifarch aarch64 -./install-for-efi/usr/bin/grub2-mkimage -d ./install-for-efi/usr/lib/grub/arm64-efi/ --sbat ./sbat.csv -o %{buildroot}%{_datadir}/grub2-efi/grubaa64.efi -p /boot/grub2 -O arm64-efi fat iso9660 part_gpt part_msdos normal boot linux configfile loopback chain efifwsetup efi_gop ls search search_label search_fs_uuid search_fs_file gfxterm gfxterm_background gfxterm_menu test all_video loadenv exfat ext2 udf halt gfxmenu png tga lsefi help probe echo lvm cryptodisk luks gcry_rijndael gcry_sha512 tpm +./install-for-efi/usr/bin/grub2-mkimage -d ./install-for-efi/usr/lib/grub/arm64-efi/ --sbat ./sbat.csv -o %{buildroot}%{_datadir}/grub2-efi/grubaa64.efi -p /boot/grub2 -O arm64-efi fat iso9660 part_gpt part_msdos normal boot linux configfile loopback chain efifwsetup efi_gop ls search search_label search_fs_uuid search_fs_file gfxterm gfxterm_background gfxterm_menu test all_video loadenv exfat ext2 udf halt gfxmenu png tga lsefi help probe echo lvm cryptodisk luks gcry_rijndael gcry_sha512 tpm efinet tftp %endif # Install to efi directory @@ -313,6 +313,10 @@ cp $GRUB_MODULE_SOURCE $EFI_BOOT_DIR/$GRUB_MODULE_NAME %endif %changelog +* Wed Feb 09 2022 Chris Co - 2.06-1 +- Update to 2.06 release +- Add efinet and tftp modules to grub efi binary + * Tue Feb 08 2022 Chris Co - 2.06~rc1-8 - Bump release number to force binary signing with new secure boot key diff --git a/cgmanifest.json b/cgmanifest.json index 6d7bbeebfa..249ab942da 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -5050,8 +5050,8 @@ "type": "other", "other": { "name": "grub2", - "version": "2.06-rc1", - "downloadUrl": "https://git.savannah.gnu.org/cgit/grub.git/snapshot/grub-2.06-rc1.tar.gz" + "version": "2.06", + "downloadUrl": "https://git.savannah.gnu.org/cgit/grub.git/snapshot/grub-2.06.tar.gz" } } },