- Disable EFI support on architectures that are not EFI-compliant

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1561

files.udev

@@ -343,6 +343,8 @@
 %{_unitdir}/sysinit.target.wants/cryptsetup.target
 %{_unitdir}/sysinit.target.wants/integritysetup.target
 %{_unitdir}/sysinit.target.wants/kmod-static-nodes.service
+%endif
+%if %{with sd_boot}
 %{_unitdir}/sysinit.target.wants/systemd-hibernate-clear.service
 %endif
 %{_unitdir}/sysinit.target.wants/systemd-hwdb-update.service
@@ -370,7 +372,7 @@
 %{_unitdir}/systemd-fsck@.service
 %{_unitdir}/systemd-growfs-root.service
 %{_unitdir}/systemd-growfs@.service
-%if %{without bootstrap}
+%if %{with sd_boot}
 %{_unitdir}/systemd-hibernate-clear.service
 %endif
 %{_unitdir}/systemd-hibernate-resume.service

systemd.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec  3 09:39:39 UTC 2024 - Franck Bui <fbui@suse.com>
+
+- Disable EFI support on architectures that are not EFI-compliant
+
 -------------------------------------------------------------------
 Tue Dec  3 08:52:48 UTC 2024 - Franck Bui <fbui@suse.com>
 

systemd.spec

@@ -781,7 +781,6 @@ for the C APIs.
         -Daudit=%{disabled_with bootstrap} \
         -Dbpf-framework=%{disabled_with bootstrap} \
         -Dbzip2=%{enabled_with importd} \
-        -Defi=%{when_not bootstrap} \
         -Delfutils=%{disabled_with bootstrap} \
         -Dfdisk=%{disabled_with bootstrap} \
         -Dgcrypt=%{disabled_with bootstrap} \
@@ -833,6 +832,7 @@ for the C APIs.
         -Dselinux=%{enabled_with selinux} \
         \
         -Dbootloader=%{enabled_with sd_boot} \
+        -Defi=%{when sd_boot} \
         -Defi-color-highlight="black,green" \
         \
         -Dsbat-distro="%{?sbat_distro}" \