AlmaLinux change: Use AlmaLinux SB

fwupd-efi.spec

@@ -1,13 +1,8 @@
+%global efi_vendor almalinux
+%global efidir almalinux
+%global efi_esp_dir /boot/efi/EFI/%{efidir}
 %global debug_package %{nil}
 
-%define sb_ca		%{_datadir}/pki/sb-certs/secureboot-ca-%{_arch}.cer
-%define sb_cer		%{_datadir}/pki/sb-certs/secureboot-fwupd-%{_arch}.cer
-%if 0%{?centos}
-%define sb_key		centossecureboot202
-%else
-%define sb_key		redhatsecureboot802
-%endif
-
 Summary:   Firmware update EFI binaries
 Name:      fwupd-efi
 Version:   1.6
@@ -16,7 +11,6 @@ License:   LGPL-2.1-or-later
 URL:       https://github.com/fwupd/fwupd-efi
 Source0:   https://github.com/fwupd/fwupd-efi/releases/download/%{version}/%{name}-%{version}.tar.xz
 
-
 # these are the only architectures supporting UEFI UpdateCapsule
 ExclusiveArch: x86_64 aarch64
 
@@ -25,7 +19,6 @@ BuildRequires: meson
 BuildRequires: gnu-efi-devel >= 3.0.18
 BuildRequires: pesign >= 113-20
 BuildRequires: python3-pefile
-BuildRequires: system-sb-certs
 
 %description
 fwupd is a project to allow updating device firmware, and this package provides
@@ -37,17 +30,11 @@ the EFI binary that is used for updating using UpdateCapsule.
 %build
 
 %meson \
-%if 0%{?centos}
-    -Defi_sbat_distro_id="centos" \
-    -Defi_sbat_distro_summary="The Fedora Project" \
-    -Defi_sbat_distro_url="https://www.centos.org/" \
-%else
-    -Defi_sbat_distro_id="rhel" \
-    -Defi_sbat_distro_summary="Red Hat Enterprise Linux" \
-    -Defi_sbat_distro_url="mailto:secalert@redhat.com" \
-%endif
+    -Defi_sbat_distro_id="almalinux" \
+    -Defi_sbat_distro_summary="AlmaLinux" \
     -Defi_sbat_distro_pkgname="%{name}" \
-    -Defi_sbat_distro_version="%{version}-%{release}"
+    -Defi_sbat_distro_version="%{version}-%{release}" \
+    -Defi_sbat_distro_url="https://git.almalinux.org/rpms/%{name}"
 
 %meson_build
 
@@ -62,8 +49,9 @@ the EFI binary that is used for updating using UpdateCapsule.
 %global efiarch aa64
 %endif
 %global fwup_efi_fn $RPM_BUILD_ROOT%{_libexecdir}/fwupd/efi/fwupd%{efiarch}.efi
+%pesign -s -i %{fwup_efi_fn} -o %{fwup_efi_fn}.tmp
 %define __pesign_client_cert fwupd-signer
-%pesign -s -i %{fwup_efi_fn} -o %{fwup_efi_fn}.signed -a %{sb_ca} -c %{sb_cer} -n %{sb_key}
+%pesign -s -i %{fwup_efi_fn}.tmp -o %{fwup_efi_fn}.signed
 rm -vf %{fwup_efi_fn}.tmp
 
 %files

gating.yaml

@@ -4,4 +4,3 @@ product_versions:
 decision_context: osci_compose_gate
 rules:
   - !PassingTestCaseRule {test_case_name: kernel-qe.kernel-ci.hardware-fwupd.tier0.functional}
-  - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}