From ee3a2b4b44fa6f2c2941783f4a764b390582e106 Mon Sep 17 00:00:00 2001 From: Sean Dougherty Date: Mon, 18 Aug 2025 22:09:45 +0000 Subject: [PATCH] systemd-boot-signed: add aarch64 package systemd-boot-signed: correct merge errors make use of rpmspec macros to match rest of signed-specs usages update grub efi for aarch64 fix grubefiname macro --- .../systemd-boot-signed.spec | 20 +++++++++++++------ SPECS/systemd/systemd.spec | 5 ++++- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec b/SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec index 2b0db483a46..7ebd5f575a2 100644 --- a/SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec +++ b/SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec @@ -1,6 +1,12 @@ %global debug_package %{nil} %ifarch x86_64 %global buildarch x86_64 +%global grubefiname grubx64.efi +%global sdbootefiname systemd-bootx64.efi +%elifarch aarch64 +%global buildarch aarch64 +%global grubefiname grubaa64.efi +%global sdbootefiname systemd-bootaa64.efi %endif # Support for quick builds with rpmbuild --build-in-place. @@ -14,7 +20,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: 22%{?dist} +Release: 23%{?dist} License: LGPL-2.1-or-later AND MIT AND GPL-2.0-or-later Vendor: Microsoft Corporation Distribution: Azure Linux @@ -32,8 +38,7 @@ URL: https://systemd.io # 3. Place the unsigned package and signed binary in this spec's folder # 4. Build this spec Source0: systemd-boot-%{version}-%{release}.%{buildarch}.rpm -Source1: systemd-bootx64.efi -ExclusiveArch: x86_64 +Source1: %{sdbootefiname} %description This package contains the systemd-boot EFI binary signed for secure boot. The package is @@ -71,8 +76,8 @@ pushd rpm_contents # This spec's whole purpose is to inject the signed systemd-boot binary rpm2cpio %{SOURCE0} | cpio -idmv -cp %{SOURCE1} ./usr/lib/systemd/boot/efi/systemd-bootx64.efi +cp %{SOURCE1} ./usr/lib/systemd/boot/efi/%{sdbootefiname} popd %install @@ -81,7 +86,7 @@ pushd rpm_contents # Don't use * wildcard. It does not copy over hidden files in the root folder... cp -rp ./. %{buildroot}/ -cp %{buildroot}/usr/lib/systemd/boot/efi/systemd-bootx64.efi %{buildroot}/boot/efi/EFI/BOOT/grubx64.efi +cp %{buildroot}/usr/lib/systemd/boot/efi/%{sdbootefiname} %{buildroot}/boot/efi/EFI/BOOT/%{grubefiname} popd @@ -90,9 +95,12 @@ popd /usr/share/man/man5/loader.conf.5.gz /usr/share/man/man7/sd-boot.7.gz /usr/share/man/man7/systemd-boot.7.gz -/boot/efi/EFI/BOOT/grubx64.efi +/boot/efi/EFI/BOOT/%{grubefiname} %changelog +* Mon Aug 18 2025 Sean Dougherty - 255-23 +- Add aarch64 package + * Wed Aug 06 2025 Sean Dougherty - 255-22 - Bump release to match systemd spec diff --git a/SPECS/systemd/systemd.spec b/SPECS/systemd/systemd.spec index 5d83763aaf4..522afff711c 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: 22%{?dist} +Release: 23%{?dist} # FIXME - hardcode to 'stable' for now as that's what we have in our blobstore %global stable 1 @@ -1228,6 +1228,9 @@ rm -f %{name}.lang # %autochangelog. So we need to continue manually maintaining the # changelog here. %changelog +* Mon Aug 18 2025 Sean Dougherty - 255-23 +- Bump release to match systemd-boot-signed spec + * Tue Aug 05 2025 Chris Co - 255-22 - enable building ukify and sd-boot on arm64 - enable pyflakes buildrequires which is needed for ukify testing