- Use AlmaLinux cert

- Add conflicts to old shim
This commit is contained in:
eabdullin 2023-03-09 11:47:31 +03:00
parent 47026741da
commit 051eab49db
2 changed files with 10 additions and 2 deletions

View File

@ -270,6 +270,11 @@ Requires: %{name}-common = %{evr} \
Requires: %{name}-tools-minimal >= %{evr} \
Requires: %{name}-tools = %{evr} \
Provides: %{name}-efi = %{evr} \
Provides: almalinux(grub2-sig-key) = 202303 \
%{expand:%%ifarch x86_64 \
Conflicts: shim-x64 <= 15.6-1.el9.alma \
Conflicts: shim-ia32 <= 15.6-1.el9.alma \
%%endif} \
%{?legacy_provides:Provides: %{name} = %{evr}} \
%{-o:Obsoletes: %{name}-efi < %{evr}} \
\

View File

@ -18,7 +18,7 @@
Name: grub2
Epoch: 1
Version: 2.06
Release: 46%{?dist}.3.alma
Release: 46%{?dist}.3.alma.1
Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+
URL: http://www.gnu.org/software/grub/
@ -44,7 +44,7 @@ Source12: sbat.csv.in
%define sb_cer %{_datadir}/pki/sb-certs/secureboot-grub2-%{_arch}.cer
%endif
%define sb_key clsecureboot001
%define sb_key almalinuxsecurebootca0
BuildRequires: gcc efi-srpm-macros
BuildRequires: flex bison binutils python3
@ -525,6 +525,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
%endif
%changelog
* Thu Mar 09 2023 Eduard Abdullin <eabdullin@almalinux.org> - 2.06-46.el9_1.3.alma.1
- Use AlmaLinux cert
* Tue Feb 14 2023 Eduard Abdullin <eabdullin@almalinux.org> - 2.06-46.el9_1.3.alma
- Debrand for AlmaLinux