diff --git a/SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec b/SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec index b844dc142e2..2b0db483a46 100644 --- a/SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec +++ b/SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec @@ -14,7 +14,7 @@ Version: 255 # determine the build information from local checkout Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/') %endif -Release: 21%{?dist} +Release: 22%{?dist} License: LGPL-2.1-or-later AND MIT AND GPL-2.0-or-later Vendor: Microsoft Corporation Distribution: Azure Linux @@ -93,6 +93,9 @@ popd /boot/efi/EFI/BOOT/grubx64.efi %changelog +* Wed Aug 06 2025 Sean Dougherty - 255-22 +- Bump release to match systemd spec + * Mon Apr 14 2025 Pawel Winogrodzki - 255-21 - Updating SRPM name to systemd-boot-signed-%%{buildarch}. diff --git a/SPECS/systemd/systemd.spec b/SPECS/systemd/systemd.spec index fef24d0ec4f..313fe141686 100644 --- a/SPECS/systemd/systemd.spec +++ b/SPECS/systemd/systemd.spec @@ -50,7 +50,7 @@ Version: 255 # determine the build information from local checkout Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/') %endif -Release: 21%{?dist} +Release: 22%{?dist} # FIXME - hardcode to 'stable' for now as that's what we have in our blobstore %global stable 1 @@ -144,7 +144,7 @@ Patch0900: do-not-test-openssl-sm3.patch Patch0901: networkd-default-use-domains.patch Patch0902: CVE-2023-7008.patch -%ifarch %{ix86} x86_64 +%ifarch %{ix86} x86_64 aarch64 %global want_bootloader 1 %endif @@ -469,6 +469,8 @@ Requires: python3dist(cryptography) Recommends: python3dist(pillow) %endif +BuildRequires: python3dist(pyflakes) + BuildArch: noarch %description ukify @@ -894,7 +896,11 @@ python3 %{SOURCE2} %buildroot %{!?want_bootloader:--no-bootloader} %if 0%{?want_bootloader} mkdir -p %{buildroot}/boot/efi/EFI/BOOT +%ifarch x86_64 cp %{buildroot}/usr/lib/systemd/boot/efi/systemd-bootx64.efi %{buildroot}/boot/efi/EFI/BOOT/grubx64.efi +%elifarch aarch64 +cp %{buildroot}/usr/lib/systemd/boot/efi/systemd-bootaa64.efi %{buildroot}/boot/efi/EFI/BOOT/grubaa64.efi +%endif %endif %check @@ -1181,7 +1187,11 @@ fi %if 0%{?want_bootloader} %files ukify -f .file-list-ukify %files boot -f .file-list-boot +%ifarch x86_64 /boot/efi/EFI/BOOT/grubx64.efi +%elifarch aarch64 +/boot/efi/EFI/BOOT/grubaa64.efi +%endif %endif %files container -f .file-list-container @@ -1217,6 +1227,9 @@ rm -f %{name}.lang # %autochangelog. So we need to continue manually maintaining the # changelog here. %changelog +* Tue Aug 05 2025 Chris Co - 255-22 +- enable building ukify and sd-boot on arm64 + * Mon Apr 14 2025 Pawel Winogrodzki - 255-21 - Bumping 'Release' tag to match the 'signed' version of the spec.