.gitignore

@@ -1,6 +1,14 @@
+SOURCES/BOOTAA64.CSV
+SOURCES/BOOTIA32.CSV
+SOURCES/BOOTX64.CSV
 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

.shim.metadata

@@ -1,6 +1,14 @@
-4591a3da03f337b27e963b69202f7109496c0ef8 SOURCES/fbaa64.efi
+fe978419c312c0c415d52befb4f6561e2d9556a7 SOURCES/BOOTAA64.CSV
-403a4e918a00f5e90551085c7ba545969feee26e SOURCES/fbx64.efi
+9650b41c0227b343478d03f4d7fcd6c8d3744440 SOURCES/BOOTIA32.CSV
-48fe2246bcc52729315e7db8361d753ab6be1633 SOURCES/mmaa64.efi
+6801abf1c4d54f15f869470c99e480433940407a SOURCES/BOOTX64.CSV
-08fa765dbe8902c022fe0d5b5803c14bc1e44a5c SOURCES/mmx64.efi
+317f45115504f1ba56f0113dc217460e3c26cf82 SOURCES/fbaa64.efi
-5749db804fd2a2cef94ae2a05680ac63854b3239 SOURCES/shimaa64.efi
+4fd02a6b3ec5dc58fcba1a3d8dec69e0cb86f5d5 SOURCES/fbia32.efi
-1208043ca28f8566c115d8a15ba9bd8163b6badb SOURCES/shimx64.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

SOURCES/shim.rpmmacros

@@ -3,33 +3,40 @@
 %global vendor_token_str %{expand:%%{nil}%%{?vendor_token_name:-t "%{vendor_token_name}"}}
 %global vendor_cert_str %{expand:%%{!?vendor_cert_nickname:-c "Red Hat Test Certificate"}%%{?vendor_cert_nickname:-c "%%{vendor_cert_nickname}"}}
 
-%global grub_version 2.06-27.el9_0.12
+%global grub_version 2.02-87.el8_1.11
 
 %global bootcsvaa64 %{expand:%{SOURCE10}}
+%global bootcsvia32 %{expand:%{SOURCE11}}
 %global bootcsvx64 %{expand:%{SOURCE12}}
 #%%global bootcsvarm %%{expand:%%{SOURCE13}}
 
 %global shimefiaa64 %{expand:%{SOURCE20}}
+%global shimefiia32 %{expand:%{SOURCE21}}
 %global shimefix64 %{expand:%{SOURCE22}}
 #%%global shimefiarm %%{expand:%%{SOURCE23}
 
 %global fbefiaa64 %{expand:%{SOURCE30}}
+%global fbefiia32 %{expand:%{SOURCE31}}
 %global fbefix64 %{expand:%{SOURCE32}}
 #%%global fbefiarm %%{expand:%%{SOURCE33}
 
 %global mmefiaa64 %{expand:%{SOURCE40}}
+%global mmefiia32 %{expand:%{SOURCE41}}
 %global mmefix64 %{expand:%{SOURCE42}}
 #%%global mmefiarm %%{expand:%%{SOURCE43}
 
-%global shimveraa64 15.8-2.el9.alma.1
+%global shimveraa64 15-7.el8_1
-%global shimverx64 15.8-2.el9.alma.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
 %global shimdirx64 %{_datadir}/shim/%{shimverx64}/x64
 #%%global shimdirarm %%{_datadir}/shim/%%{shimverarm}/arm
 
 %global unsignedaa64 shim-unsigned-aarch64
+%global unsignedia32 shim-unsigned-ia32
 %global unsignedx64 shim-unsigned-x64
 #%%global unsignedarm shim-unsigned-arm
 
@@ -57,11 +64,6 @@ Requires: mokutil >= 1:0.3.0-1						\
 Requires: efi-filesystem						\
 Provides: shim-signed-%{-a*} = %{version}-%{release}			\
 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}				\
 Conflicts: grub2-efi-%{-a*} < %{grub_version}				\
 %{expand:%%if 0%%{-p*}							\
 Provides: shim = %{version}-%{release}					\
@@ -185,7 +187,7 @@ install -m 0700 fb%{-a*}.efi						\\\
 
 %ifarch x86_64
 %global is_signed yes
-%global is_alt_signed no
+%global is_alt_signed yes
 %global provide_legacy_shim 1
 %endif
 %ifarch aarch64

SPECS/shim.spec

@@ -1,22 +1,21 @@
-%global efi_vendor almalinux
-%global efidir almalinux
-%global efi_esp_dir /boot/efi/EFI/%{efidir}
-
 Name:		shim
 Version:	15.8
-Release:	4%{?dist}.alma.1
+Release:	4%{?dist}
 Summary:	First-stage UEFI bootloader
 License:	BSD
 URL:		https://github.com/rhboot/shim/
 BuildRequires:	efi-filesystem
-BuildRequires:	efi-srpm-macros >= 6
+BuildRequires:	efi-srpm-macros >= 3-2
 
 ExclusiveArch:	%{efi}
+# but we don't build a .i686 package, just a shim-ia32.x86_64 package
+ExcludeArch:	%{ix86}
 # and we don't have shim-unsigned-arm builds *yet*
-ExcludeArch:	%{arm} %{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, ...
@@ -24,6 +23,10 @@ Source10:	BOOTAA64.CSV
 Source20:	shimaa64.efi
 Source30:	mmaa64.efi
 Source40:	fbaa64.efi
+Source11:	BOOTIA32.CSV
+Source21:	shimia32.efi
+Source31:	mmia32.efi
+Source41:	fbia32.efi
 Source12:	BOOTX64.CSV
 Source22:	shimx64.efi
 Source32:	mmx64.efi
@@ -71,8 +74,9 @@ mkdir shim-%{version}
 export PS4='${LINENO}: '
 
 cd shim-%{version}
+# Temporarily using _sourcedir to avoid build dep annoyances.
 %if %{efi_has_alt_arch}
-%define_build -a %{efi_alt_arch} -A %{efi_alt_arch_upper} -i %{shimefialt} -b yes -c %{is_alt_signed} -d %{shimdiralt}
+%define_build -a %{efi_alt_arch} -A %{efi_alt_arch_upper} -i %{shimefialt} -b yes -c %{is_alt_signed} -d %{_sourcedir}
 %endif
 %define_build -a %{efi_arch} -A %{efi_arch_upper} -i %{shimefi} -b yes -c %{is_signed} -d %{_sourcedir}
 
@@ -107,9 +111,6 @@ install -m 0700 %{shimefi} $RPM_BUILD_ROOT%{efi_esp_dir}/shim.efi
 %endif
 
 %changelog
-* Fri May 10 2024 Eduard Abdullin <eabdullin@almalinux.org> - 15.8-4.el9_3.alma.1
-- Use AlmaLinux cert
-
 * 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