From e193d2bce749021d14871de463aab87fa342389e Mon Sep 17 00:00:00 2001
From: rockyautomation <rockyautomation@rockylinux.org>
Date: Thu, 22 Apr 2021 17:29:31 +0000
Subject: [PATCH] import grub2-2.02-90.el8_3.1
---
SOURCES/grub.macros | 6 ++----
SPECS/grub2.spec | 7 +++++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
index 6279c55..3bf32f2 100644
--- a/SOURCES/grub.macros
+++ b/SOURCES/grub.macros
@@ -372,10 +372,8 @@ done \
%{4}./grub-mkimage -O %{1} -o %{3}.orig \\\
-p /EFI/BOOT -d grub-core ${GRUB_MODULES} \\\
--sbat %{4}./sbat.csv \
-%{expand:%%{pesign -s -i %%{2}.orig -o %%{2}.one -a %%{5} -c %%{6} -n %%{7}}} \
-%{expand:%%{pesign -s -i %%{3}.orig -o %%{3}.one -a %%{5} -c %%{6} -n %%{7}}} \
-%{expand:%%{pesign -s -i %%{2}.one -o %%{2} -a %%{8} -c %%{9} -n %%{10}}} \
-%{expand:%%{pesign -s -i %%{3}.one -o %%{3} -a %%{8} -c %%{9} -n %%{10}}} \
+%{expand:%%{pesign -s -i %%{2}.orig -o %%{2} -a %%{5} -c %%{6} -n %%{7}}} \
+%{expand:%%{pesign -s -i %%{3}.orig -o %%{3} -a %%{5} -c %%{6} -n %%{7}}} \
%{nil}
%else
%define mkimage() \
diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec
index e0fb02a..ce81bd2 100644
--- a/SPECS/grub2.spec
+++ b/SPECS/grub2.spec
@@ -502,10 +502,13 @@ fi
%endif
%changelog
-* Sun Apr 11 2021 Sherif Nagy <sherif@rockylinux.org> - 2.02-90
+* Thu Apr 22 2021 Sherif Nagy <sherif@rockylinux.org> - 2.02-90
+- Cleaning up grup.macro extra signing certs
+
+* Thu Apr 22 2021 Sherif Nagy <sherif@rockylinux.org> - 2.02-90
- Adding Rocky testing CA, CERT and sbat files
-* Sun Apr 11 2021 Rich Alloway <ralloway@perforce.com> - 2.02-90
+* Thu Apr 22 2021 Rich Alloway <ralloway@perforce.com> - 2.02-90
- Apply Rocky Linux debranding changes
* Thu Feb 25 2021 Javier Martinez Canillas <javierm@redhat.com> - 2.02-90.el8_3.1
--
GitLab