rpms/grub2
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix sbat and spec file

Browse Source
This commit is contained in:
eabdullin 2022-10-07 10:49:17 +03:00
parent f416e63f99
commit 0f7ff21e15
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SOURCES/sbat.csv.in
View File

@ -1,4 +1,4 @@
sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
grub,2,Free Software Foundation,grub,@@VERSION@@,https//www.gnu.org/software/grub/ grub,2,Free Software Foundation,grub,@@VERSION@@,https//www.gnu.org/software/grub/
grub.rh,2,Red Hat,grub2,@@VERSION_RELEASE@@,mailto:secalert@redhat.com grub.rh,2,Red Hat,grub2,@@RHEL_VERSION_RELEASE@@,mailto:secalert@redhat.com
grub.almalinux8,2,AlmaLinux 8,grub2,@@VERSION_RELEASE@@,mail:security@almalinux.org grub.almalinux,2,AlmaLinux,grub2,@@VERSION_RELEASE@@,mail:security@almalinux.org

10
SPECS/grub2.spec
View File

@ -45,7 +45,7 @@ Source19: sbat.csv.in
%endif %endif
# AlmaLinux: keep upstream EVR for RHEL SBAT entry # AlmaLinux: keep upstream EVR for RHEL SBAT entry
%define rhel_evr $(echo %{evr} | sed 's/\.alma.*//') %define rhel_version_release $(echo %{version}-%{release} | sed 's/\.alma.*//')
# generate with do-rebase # generate with do-rebase
%include %{SOURCE2} %include %{SOURCE2}
@ -164,7 +164,7 @@ This subpackage provides tools for support of all platforms.
mkdir grub-%{grubefiarch}-%{tarversion} mkdir grub-%{grubefiarch}-%{tarversion}
grep -A100000 '# stuff "make" creates' .gitignore > grub-%{grubefiarch}-%{tarversion}/.gitignore grep -A100000 '# stuff "make" creates' .gitignore > grub-%{grubefiarch}-%{tarversion}/.gitignore
cp %{SOURCE4} grub-%{grubefiarch}-%{tarversion}/unifont.pcf.gz cp %{SOURCE4} grub-%{grubefiarch}-%{tarversion}/unifont.pcf.gz
sed -e "s,@@VERSION@@,%{version},g" -e "s,@@VERSION_RELEASE@@,%{version}-%{release},g" \ sed -e "s,@@VERSION@@,%{version},g" -e "s,@@VERSION_RELEASE@@,%{version}-%{release},g" -e "s,@@RHEL_VERSION_RELEASE@@,%{rhel_version_release},g" \
%{SOURCE19} > grub-%{grubefiarch}-%{tarversion}/sbat.csv %{SOURCE19} > grub-%{grubefiarch}-%{tarversion}/sbat.csv
git add grub-%{grubefiarch}-%{tarversion} git add grub-%{grubefiarch}-%{tarversion}
%endif %endif
@ -508,12 +508,9 @@ fi
%endif %endif
%changelog %changelog
<<<<<<< HEAD * Fri Oct 07 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 2.06-138.alma
* Tue Apr 05 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 2.06-120.alma
- Use AlmaLinux cert and SBAT - Use AlmaLinux cert and SBAT
* Fri Feb 28 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-120
=======
* Wed Jul 20 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-138 * Wed Jul 20 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-138
- Rotate signing keys on ppc64le - Rotate signing keys on ppc64le
- Resolves: #2074762 - Resolves: #2074762
@ -552,7 +549,6 @@ fi
- Backport support for loading initrd above 4GB - Backport support for loading initrd above 4GB
* Mon Feb 28 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-120 * Mon Feb 28 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-120
>>>>>>> c8-beta
- Bump signing - Bump signing
- Resolves: #2032294 - Resolves: #2032294