Compare commits

..

No commits in common. "a8" and "c8" have entirely different histories.
a8 ... c8

4 changed files with 24 additions and 37 deletions

3
.gitignore vendored
View File

@ -1,13 +1,14 @@
SOURCES/BOOTAA64.CSV
SOURCES/BOOTIA32.CSV
SOURCES/BOOTX64.CSV
SOURCES/almalinuxsecurebootca0.cer
SOURCES/fbaa64.efi
SOURCES/fbia32.efi
SOURCES/fbx64.efi
SOURCES/mmaa64.efi
SOURCES/mmia32.efi
SOURCES/mmx64.efi
SOURCES/redhatsecureboot501.cer
SOURCES/redhatsecurebootca5.cer
SOURCES/shimaa64.efi
SOURCES/shimia32.efi
SOURCES/shimx64.efi

View File

@ -1,13 +1,14 @@
e2bd0ba50614457483a298097b2252b6f18c0a1b SOURCES/BOOTAA64.CSV
46bef68f0c2f722f4bb59385a8917c18210d4c4f SOURCES/BOOTIA32.CSV
cca8dd0b9b2e2d3a5e693087a926cb63150a0b2f SOURCES/BOOTX64.CSV
077f737b9a26b59d2517ee390879f02ab464a284 SOURCES/almalinuxsecurebootca0.cer
4591a3da03f337b27e963b69202f7109496c0ef8 SOURCES/fbaa64.efi
0bbc4ac41e7ed2fb284f76995dac4be4f86f18a1 SOURCES/fbia32.efi
403a4e918a00f5e90551085c7ba545969feee26e SOURCES/fbx64.efi
48fe2246bcc52729315e7db8361d753ab6be1633 SOURCES/mmaa64.efi
8cbdaee830b36fc741e7f04228422933c07bbb4f SOURCES/mmia32.efi
08fa765dbe8902c022fe0d5b5803c14bc1e44a5c SOURCES/mmx64.efi
206b13df7ccae83bf2f961da7010e16eac372b28 SOURCES/shimaa64.efi
489ce4f178645f1317ffb3401007694e2ec77638 SOURCES/shimia32.efi
1208043ca28f8566c115d8a15ba9bd8163b6badb SOURCES/shimx64.efi
fe978419c312c0c415d52befb4f6561e2d9556a7 SOURCES/BOOTAA64.CSV
9650b41c0227b343478d03f4d7fcd6c8d3744440 SOURCES/BOOTIA32.CSV
6801abf1c4d54f15f869470c99e480433940407a SOURCES/BOOTX64.CSV
317f45115504f1ba56f0113dc217460e3c26cf82 SOURCES/fbaa64.efi
4fd02a6b3ec5dc58fcba1a3d8dec69e0cb86f5d5 SOURCES/fbia32.efi
b26bb4ed41e96d6e2b2471dc5d50f0f2c88ff884 SOURCES/fbx64.efi
b2e0f92dba676facda778be739e2959f5e51c077 SOURCES/mmaa64.efi
e8316a74f06a29385eeb7fd734f582e60dc7a2a4 SOURCES/mmia32.efi
77f25d23c6b0bb2f79a47d574f8af5ffe91e2466 SOURCES/mmx64.efi
ba0b760e594ff668ee72ae348adf3e49b97f75fb SOURCES/redhatsecureboot501.cer
e6f506462069aa17d2e8610503635c20f3a995c3 SOURCES/redhatsecurebootca5.cer
750bd7932437b1fb6610c233f69db1b70d67fab1 SOURCES/shimaa64.efi
0cd6ef62726de2f1321bfe6b70f47b788ac38666 SOURCES/shimia32.efi
86855303a18b978cf90d6c244bfe30897f449996 SOURCES/shimx64.efi

View File

@ -25,10 +25,10 @@
%global mmefix64 %{expand:%{SOURCE42}}
#%%global mmefiarm %%{expand:%%{SOURCE43}
%global shimveraa64 15.8-2.el8.alma.1
%global shimveria32 15.8-2.el8.alma.1
%global shimverx64 15.8-2.el8.alma.1
#%%global shimverarm 15-1.el8.alma.1
%global shimveraa64 15-7.el8_1
%global shimveria32 15.8-2.el8
%global shimverx64 15.8-2.el8
#%%global shimverarm 15-1.el8
%global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64
%global shimdiria32 %{_datadir}/shim/%{shimveria32}/ia32
@ -64,12 +64,6 @@ Requires: mokutil >= 1:0.3.0-1 \
Requires: efi-filesystem \
Provides: shim-signed-%{-a*} = %{version}-%{release} \
Requires: dbxtool >= 0.6-3 \
Requires: %{efi_esp_dir}/grub%{-a*}.efi \
%{expand:%ifarch x86_64 \
# SecureBoot keys dependencies \
Requires: almalinux(grub2-sig-key) >= 202303 \
Requires: almalinux(kernel-sig-key) >= 202303 \
%endif} \
Conflicts: grub2-efi-%{-a*} < %{grub_version} \
%{expand:%%if 0%%{-p*} \
Provides: shim = %{version}-%{release} \
@ -197,7 +191,7 @@ install -m 0700 fb%{-a*}.efi \\\
%global provide_legacy_shim 1
%endif
%ifarch aarch64
%global is_signed yes
%global is_signed no
%global is_alt_signed no
%global provide_legacy_shim 1
%endif

View File

@ -1,10 +1,6 @@
%global efi_vendor almalinux
%global efidir almalinux
%global efi_esp_dir /boot/efi/EFI/%{efidir}
Name: shim
Version: 15.8
Release: 4%{?dist}.alma.2
Release: 4%{?dist}
Summary: First-stage UEFI bootloader
License: BSD
URL: https://github.com/rhboot/shim/
@ -18,7 +14,8 @@ ExcludeArch: %{ix86}
ExcludeArch: %{arm}
Source0: shim.rpmmacros
Source1: almalinuxsecurebootca0.cer
Source1: redhatsecureboot501.cer
Source2: redhatsecurebootca5.cer
# keep these two lists of sources synched up arch-wise. That is 0 and 10
# match, 1 and 11 match, ...
@ -114,12 +111,6 @@ install -m 0700 %{shimefi} $RPM_BUILD_ROOT%{efi_esp_dir}/shim.efi
%endif
%changelog
* Fri Jul 26 2024 Eduard Abdullin <eabdullin@almalinux.org> - 15.8-4.alma.2
- Add SB for aarch64
* Fri May 10 2024 Eduard Abdullin <eabdullin@almalinux.org> - 15.8-4.alma.1
- AlmaLinux changes
* Tue Apr 16 2024 Peter Jones <pjones@redhat.com> - 15.8-4
- Bump the release to *-4* to work around a build system issue.
Related: RHEL-11259