SHA256
1
0
forked from pool/systemd

fix build on s390x where sd_boot=false

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1326
This commit is contained in:
Franck Bui 2022-11-15 09:34:37 +00:00 committed by Git OBS Bridge
parent 518d9b73f4
commit 01bb6005e2
2 changed files with 15 additions and 1 deletions

View File

@ -3,7 +3,9 @@
# #
%config(noreplace) %{_sysconfdir}/systemd/homed.conf %config(noreplace) %{_sysconfdir}/systemd/homed.conf
%config(noreplace) %{_sysconfdir}/systemd/oomd.conf %config(noreplace) %{_sysconfdir}/systemd/oomd.conf
%if %{with sd_boot}
%dir %{_unitdir}/initrd.target.wants %dir %{_unitdir}/initrd.target.wants
%endif
%{_bindir}/homectl %{_bindir}/homectl
%{_bindir}/oomctl %{_bindir}/oomctl
%{_bindir}/systemd-repart %{_bindir}/systemd-repart
@ -23,7 +25,9 @@
%{_datadir}/zsh/site-functions/_oomctl %{_datadir}/zsh/site-functions/_oomctl
%{_mandir}/man1/homectl.1.gz %{_mandir}/man1/homectl.1.gz
%{_mandir}/man1/oomctl.1.gz %{_mandir}/man1/oomctl.1.gz
%if %{with sd_boot}
%{_mandir}/man1/systemd-measure.1.gz %{_mandir}/man1/systemd-measure.1.gz
%endif
%{_mandir}/man1/userdbctl.1.gz %{_mandir}/man1/userdbctl.1.gz
%{_mandir}/man5/homed.conf.5.gz %{_mandir}/man5/homed.conf.5.gz
%{_mandir}/man5/homed.conf.d.5.gz %{_mandir}/man5/homed.conf.d.5.gz
@ -38,10 +42,12 @@
%{_mandir}/man8/systemd-homed.service.8.gz %{_mandir}/man8/systemd-homed.service.8.gz
%{_mandir}/man8/systemd-oomd.8.gz %{_mandir}/man8/systemd-oomd.8.gz
%{_mandir}/man8/systemd-oomd.service.8.gz %{_mandir}/man8/systemd-oomd.service.8.gz
%if %{with sd_boot}
%{_mandir}/man8/systemd-pcrphase-initrd.service.8.gz %{_mandir}/man8/systemd-pcrphase-initrd.service.8.gz
%{_mandir}/man8/systemd-pcrphase-sysinit.service.8.gz %{_mandir}/man8/systemd-pcrphase-sysinit.service.8.gz
%{_mandir}/man8/systemd-pcrphase.8.gz %{_mandir}/man8/systemd-pcrphase.8.gz
%{_mandir}/man8/systemd-pcrphase.service.8.gz %{_mandir}/man8/systemd-pcrphase.service.8.gz
%endif
%{_mandir}/man8/systemd-repart.8.gz %{_mandir}/man8/systemd-repart.8.gz
%{_mandir}/man8/systemd-repart.service.8.gz %{_mandir}/man8/systemd-repart.service.8.gz
%{_mandir}/man8/systemd-sysupdate-reboot.service.8.gz %{_mandir}/man8/systemd-sysupdate-reboot.service.8.gz
@ -56,23 +62,31 @@
%{_systemd_util_dir}/system/sysinit.target.wants/systemd-repart.service %{_systemd_util_dir}/system/sysinit.target.wants/systemd-repart.service
%{_systemd_util_dir}/systemd-homed %{_systemd_util_dir}/systemd-homed
%{_systemd_util_dir}/systemd-homework %{_systemd_util_dir}/systemd-homework
%if %{with sd_boot}
%{_systemd_util_dir}/systemd-measure %{_systemd_util_dir}/systemd-measure
%endif
%{_systemd_util_dir}/systemd-oomd %{_systemd_util_dir}/systemd-oomd
%if %{with sd_boot}
%{_systemd_util_dir}/systemd-pcrphase %{_systemd_util_dir}/systemd-pcrphase
%endif
%{_systemd_util_dir}/systemd-sysupdate %{_systemd_util_dir}/systemd-sysupdate
%{_systemd_util_dir}/systemd-userdbd %{_systemd_util_dir}/systemd-userdbd
%{_systemd_util_dir}/systemd-userwork %{_systemd_util_dir}/systemd-userwork
%{_sysusersdir}/systemd-oom.conf %{_sysusersdir}/systemd-oom.conf
%if %{with sd_boot}
%{_unitdir}/initrd.target.wants/systemd-pcrphase-initrd.service %{_unitdir}/initrd.target.wants/systemd-pcrphase-initrd.service
%{_unitdir}/sysinit.target.wants/systemd-pcrphase-sysinit.service %{_unitdir}/sysinit.target.wants/systemd-pcrphase-sysinit.service
%{_unitdir}/sysinit.target.wants/systemd-pcrphase.service %{_unitdir}/sysinit.target.wants/systemd-pcrphase.service
%endif
%{_unitdir}/systemd-homed-activate.service %{_unitdir}/systemd-homed-activate.service
%{_unitdir}/systemd-homed.service %{_unitdir}/systemd-homed.service
%{_unitdir}/systemd-oomd.service %{_unitdir}/systemd-oomd.service
%{_unitdir}/systemd-oomd.socket %{_unitdir}/systemd-oomd.socket
%if %{with sd_boot}
%{_unitdir}/systemd-pcrphase-initrd.service %{_unitdir}/systemd-pcrphase-initrd.service
%{_unitdir}/systemd-pcrphase-sysinit.service %{_unitdir}/systemd-pcrphase-sysinit.service
%{_unitdir}/systemd-pcrphase.service %{_unitdir}/systemd-pcrphase.service
%endif
%{_unitdir}/systemd-repart.service %{_unitdir}/systemd-repart.service
%{_unitdir}/systemd-sysupdate-reboot.service %{_unitdir}/systemd-sysupdate-reboot.service
%{_unitdir}/systemd-sysupdate-reboot.timer %{_unitdir}/systemd-sysupdate-reboot.timer

View File

@ -59,7 +59,7 @@
%bcond_without portabled %bcond_without portabled
%bcond_without resolved %bcond_without resolved
%ifarch %{ix86} x86_64 aarch64 %ifarch %{ix86} x86_64 aarch64
%bcond_without sd_boot %bcond_with sd_boot
%else %else
%bcond_with sd_boot %bcond_with sd_boot
%endif %endif