Skip to content

Enable building systemd-ukify and systemd-boot on ARM64 #14449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: 3.0-dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -93,6 +93,9 @@ popd
/boot/efi/EFI/BOOT/grubx64.efi

%changelog
* Wed Aug 06 2025 Sean Dougherty <[email protected]> - 255-22
- Bump release to match systemd spec

* Mon Apr 14 2025 Pawel Winogrodzki <[email protected]> - 255-21
- Updating SRPM name to systemd-boot-signed-%%{buildarch}.

Expand Down
17 changes: 15 additions & 2 deletions SPECS/systemd/systemd.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -469,6 +469,8 @@ Requires: python3dist(cryptography)
Recommends: python3dist(pillow)
%endif

BuildRequires: python3dist(pyflakes)

BuildArch: noarch

%description ukify
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 <[email protected]> - 255-22
- enable building ukify and sd-boot on arm64

* Mon Apr 14 2025 Pawel Winogrodzki <[email protected]> - 255-21
- Bumping 'Release' tag to match the 'signed' version of the spec.

Expand Down
Loading