rpms/shim
7
0
Fork 1
Code Issues Pull Requests Releases Activity

- Use AlmaLinux cert

Browse Source 
- Add conflicts to old shim
This commit is contained in:
eabdullin 2023-03-09 11:35:03 +03:00
parent c175bce50b
commit 86c7e55cc8
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.shim.metadata
View File

@ -1,4 +1,4 @@
bfee65ae45498fefd64b16edf9993415b625cb3c SOURCES/shimaa64.efi bfee65ae45498fefd64b16edf9993415b625cb3c SOURCES/shimaa64.efi
5957bbccac9f22c1738039679204be0bb57c3812 SOURCES/shimx64.efi 8d5251f1166c9dd43426903459fe95d4bd262483 SOURCES/shimx64.efi
122b21c2da0ca4ee839d4bb6beff7ddffd68f1a0 SOURCES/fbx64.efi 122b21c2da0ca4ee839d4bb6beff7ddffd68f1a0 SOURCES/fbx64.efi
a4f7a273cc9a531a6ef125b91353f479cfa5f79c SOURCES/mmx64.efi a4f7a273cc9a531a6ef125b91353f479cfa5f79c SOURCES/mmx64.efi

BIN
SOURCES/almalinuxsecurebootca0.cer Normal file
View File

Binary file not shown.

BIN
SOURCES/clsecureboot001.cer
View File

Binary file not shown.

7
SOURCES/shim.rpmmacros
View File

@ -20,7 +20,7 @@
#%%global mmefiarm %%{expand:%%{SOURCE43} #%%global mmefiarm %%{expand:%%{SOURCE43}
%global shimveraa64 15-6.el9.alma %global shimveraa64 15-6.el9.alma
%global shimverx64 15.6-1.el9.alma %global shimverx64 15.6-1.el9.alma.1
#%%global shimverarm 15-1.el8 #%%global shimverarm 15-1.el8
%global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64 %global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64
@ -55,6 +55,11 @@ Requires: mokutil >= 1:0.3.0-1 \
Requires: efi-filesystem \ Requires: efi-filesystem \
Provides: shim-signed-%{-a*} = %{version}-%{release} \ Provides: shim-signed-%{-a*} = %{version}-%{release} \
Requires: dbxtool >= 0.6-3 \ Requires: dbxtool >= 0.6-3 \
%{expand:%ifarch x86_64 \
# SecureBoot keys dependencies \
Requires: almalinux(grub2-sig-key) >= 202303 \
Requires: almalinux(kernel-sig-key) >= 202303 \
%endif} \
%{expand:%%if 0%%{-p*} \ %{expand:%%if 0%%{-p*} \
Provides: shim = %{version}-%{release} \ Provides: shim = %{version}-%{release} \
Provides: shim-signed = %{version}-%{release} \ Provides: shim-signed = %{version}-%{release} \

10
SPECS/shim.spec
View File

@ -1,6 +1,6 @@
Name: shim Name: shim
Version: 15.6 Version: 15.6
Release: 1.el9.alma Release: 1.el9.alma.1
Summary: First-stage UEFI bootloader Summary: First-stage UEFI bootloader
License: BSD License: BSD
URL: https://github.com/rhboot/shim/ URL: https://github.com/rhboot/shim/
@ -12,7 +12,7 @@ ExclusiveArch: %{efi}
ExcludeArch: %{arm} %{ix86} ExcludeArch: %{arm} %{ix86}
Source0: shim.rpmmacros Source0: shim.rpmmacros
Source1: clsecureboot001.cer Source1: almalinuxsecurebootca0.cer
# keep these two lists of sources synched up arch-wise. That is 0 and 10 # keep these two lists of sources synched up arch-wise. That is 0 and 10
# match, 1 and 11 match, ... # match, 1 and 11 match, ...
@ -39,7 +39,7 @@ BuildRequires: pesign >= 0.112-20.fc27
# we can just BuildRequires that. # we can just BuildRequires that.
%ifarch x86_64 %ifarch x86_64
## BuildRequires: %% {unsignedx64} = %% {shimverx64} ## BuildRequires: %% {unsignedx64} = %% {shimverx64}
BuildRequires: shim-unsigned-x64 = 15.6-1.el9.alma BuildRequires: shim-unsigned-x64 = 15.6-1.el9.alma.1
%endif %endif
%ifarch aarch64 %ifarch aarch64
BuildRequires: %{unsignedaa64} = %{shimveraa64} BuildRequires: %{unsignedaa64} = %{shimveraa64}
@ -103,8 +103,8 @@ install -m 0700 %{shimefi} $RPM_BUILD_ROOT%{efi_esp_dir}/shim.efi
%endif %endif
%changelog %changelog
* Tue Aug 23 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 15.6-1.el9.alma * Thu Mar 09 2023 Eduard Abdullin <eabdullin@almalinux.org> - 15.6-1.el9.alma.1
- AlmaLinux changes - Use AlmaLinux cert
* Mon Jun 06 2022 Peter Jones <pjones@redhat.com> - 15.6-1.el9 * Mon Jun 06 2022 Peter Jones <pjones@redhat.com> - 15.6-1.el9
- Update to shim-15.6 - Update to shim-15.6