From 327aaa8fb66da437abe8fc6bf061a72d36586146 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 20 Aug 2024 09:45:04 +0300 Subject: [PATCH] AlmaLinux changes --- fwupd-efi.spec | 47 ++++++++++++++++++++++++++++++----------- redhatsecureboot301.cer | 0 redhatsecureboot503.cer | 0 redhatsecurebootca3.cer | 0 redhatsecurebootca5.cer | 0 5 files changed, 35 insertions(+), 12 deletions(-) delete mode 100644 redhatsecureboot301.cer delete mode 100644 redhatsecureboot503.cer delete mode 100644 redhatsecurebootca3.cer delete mode 100644 redhatsecurebootca5.cer diff --git a/fwupd-efi.spec b/fwupd-efi.spec index bff1a6a..37c2f59 100644 --- a/fwupd-efi.spec +++ b/fwupd-efi.spec @@ -1,18 +1,16 @@ +%global efi_vendor almalinux +%global efidir almalinux +%global efi_esp_dir /boot/efi/EFI/%{efidir} %global debug_package %{nil} Summary: Firmware update EFI binaries Name: fwupd-efi Version: 1.6 -Release: %autorelease +Release: 2%{dist}.alma.1 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 -Source300: redhatsecurebootca3.cer -Source301: redhatsecureboot301.cer -Source500: redhatsecurebootca5.cer -Source503: redhatsecureboot503.cer - # these are the only architectures supporting UEFI UpdateCapsule ExclusiveArch: x86_64 aarch64 @@ -32,11 +30,11 @@ the EFI binary that is used for updating using UpdateCapsule. %build %meson \ - -Defi_sbat_distro_id="fedora" \ - -Defi_sbat_distro_summary="The Fedora Project" \ + -Defi_sbat_distro_id="almalinux" \ + -Defi_sbat_distro_summary="AlmaLinux" \ -Defi_sbat_distro_pkgname="%{name}" \ -Defi_sbat_distro_version="%{version}-%{release}" \ - -Defi_sbat_distro_url="https://src.fedoraproject.org/rpms/%{name}" + -Defi_sbat_distro_url="https://git.almalinux.org/rpms/%{name}" %meson_build @@ -51,9 +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 -a %{SOURCE300} -c %{SOURCE301} -n redhatsecureboot301 +%pesign -s -i %{fwup_efi_fn} -o %{fwup_efi_fn}.tmp %define __pesign_client_cert fwupd-signer -%pesign -s -i %{fwup_efi_fn}.tmp -o %{fwup_efi_fn}.signed -a %{SOURCE500} -c %{SOURCE503} -n redhatsecureboot503 +%pesign -s -i %{fwup_efi_fn}.tmp -o %{fwup_efi_fn}.signed rm -vf %{fwup_efi_fn}.tmp %files @@ -64,4 +62,29 @@ rm -vf %{fwup_efi_fn}.tmp %{_libdir}/pkgconfig/fwupd-efi.pc %changelog -%autochangelog +* Tue Aug 20 2024 Eduard Abdullin - 1.6-2.alma.1 +- AlmaLinux changes + +* Mon Jun 24 2024 Troy Dawson - 1.6-2 +- Bump release for June 2024 mass rebuild + +* Mon Jun 03 2024 Richard Hughes - 1.6-1 +- Rebase to latest upstream version + +* Wed Jul 19 2023 Fedora Release Engineering - 1.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jun 29 2023 Yaakov Selkowitz - 1.4-3 +- Fix build with latest gnu-efi + +* Wed Feb 22 2023 Richard Hughes - 1.4-2 +- migrated to SPDX license + +* Fri Jan 27 2023 Richard Hughes - 1.4-1 +- New upstream release + +* Thu Jan 19 2023 Fedora Release Engineering - 1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/redhatsecureboot301.cer b/redhatsecureboot301.cer deleted file mode 100644 index e69de29..0000000 diff --git a/redhatsecureboot503.cer b/redhatsecureboot503.cer deleted file mode 100644 index e69de29..0000000 diff --git a/redhatsecurebootca3.cer b/redhatsecurebootca3.cer deleted file mode 100644 index e69de29..0000000 diff --git a/redhatsecurebootca5.cer b/redhatsecurebootca5.cer deleted file mode 100644 index e69de29..0000000