rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

- Rename %{gnu-efi} into %{sd_boot}

Browse Source 
Build conditionals (%bcond_with and %bcond_without) are used to
  define a specific feature of systemd. "gnu-efi" is rather an
  implemenation detail. Also not really sure what "efi" option alone
  is useful for since systemd-boot & co depends on "gnu-efi".
- Enable sd_boot support for aarch64

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1202
This commit is contained in:
Franck Bui 2021-10-15 11:50:45 +00:00 committed by Git OBS Bridge
parent 40636e3824
commit 4bd5e376d8
4 changed files with 50 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
systemd-mini.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Oct 15 11:38:41 UTC 2021 - Franck Bui <fbui@suse.com>
- Rename %{gnu-efi} into %{sd_boot}
Build conditionals (%bcond_with and %bcond_without) are used to
define a specific feature of systemd. "gnu-efi" is rather an
implemenation detail. Also not really sure what "efi" option alone
is useful for since systemd-boot & co depends on "gnu-efi".
- Enable sd_boot support for aarch64
-------------------------------------------------------------------
Fri Oct 15 09:27:00 UTC 2021 - Franck Bui <fbui@suse.com>

20
systemd-mini.spec
View File

@ -29,7 +29,6 @@
%define suse_version +suse.39.g7a5801342f
%define _testsuitedir /usr/lib/systemd/tests
%bcond_with gnuefi
%if 0%{?bootstrap}
%bcond_with coredump
%bcond_with importd
@ -38,20 +37,23 @@
%bcond_with networkd
%bcond_with portabled
%bcond_with resolved
%bcond_with sd_boot
%bcond_with sysvcompat
%bcond_with experimental
%bcond_with testsuite
%else
%bcond_without coredump
%ifarch %{ix86} x86_64
%bcond_without gnuefi
%endif
%bcond_without importd
%bcond_without journal_remote
%bcond_without machined
%bcond_without networkd
%bcond_without portabled
%bcond_without resolved
%ifarch %{ix86} x86_64 aarch64
%bcond_without sd_boot
%else
%bcond_with sd_boot
%endif
%bcond_without sysvcompat
%bcond_without experimental
%bcond_without testsuite
@ -117,7 +119,7 @@ BuildRequires: pkgconfig(zlib)
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33
%endif
%if %{with gnuefi}
%if %{with sd_boot}
BuildRequires: gnu-efi
%endif
@ -652,8 +654,12 @@ Have fun with these services at your own risk.
%if %{without coredump}
-Dcoredump=false \
%endif
%if %{without gnuefi}
%if %{without sd_boot}
-Defi=false \
-Dgnu-efi=false \
%else
-Defi=true \
-Dgnu-efi=true \
%endif
%if %{without importd}
-Dimportd=false \
@ -1367,7 +1373,7 @@ fi
%{_pam_moduledir}/pam_systemd.so
%if %{with gnuefi}
%if %{with sd_boot}
%dir %{_prefix}/lib/systemd/boot
%dir %{_prefix}/lib/systemd/boot/efi
%{_prefix}/lib/systemd/boot/efi/*.efi

12
systemd.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Oct 15 11:38:41 UTC 2021 - Franck Bui <fbui@suse.com>
- Rename %{gnu-efi} into %{sd_boot}
Build conditionals (%bcond_with and %bcond_without) are used to
define a specific feature of systemd. "gnu-efi" is rather an
implemenation detail. Also not really sure what "efi" option alone
is useful for since systemd-boot & co depends on "gnu-efi".
- Enable sd_boot support for aarch64
-------------------------------------------------------------------
Fri Oct 15 09:27:00 UTC 2021 - Franck Bui <fbui@suse.com>

20
systemd.spec
View File

@ -27,7 +27,6 @@
%define suse_version +suse.39.g7a5801342f
%define _testsuitedir /usr/lib/systemd/tests
%bcond_with gnuefi
%if 0%{?bootstrap}
%bcond_with coredump
%bcond_with importd
@ -36,20 +35,23 @@
%bcond_with networkd
%bcond_with portabled
%bcond_with resolved
%bcond_with sd_boot
%bcond_with sysvcompat
%bcond_with experimental
%bcond_with testsuite
%else
%bcond_without coredump
%ifarch %{ix86} x86_64
%bcond_without gnuefi
%endif
%bcond_without importd
%bcond_without journal_remote
%bcond_without machined
%bcond_without networkd
%bcond_without portabled
%bcond_without resolved
%ifarch %{ix86} x86_64 aarch64
%bcond_without sd_boot
%else
%bcond_with sd_boot
%endif
%bcond_without sysvcompat
%bcond_without experimental
%bcond_without testsuite
@ -115,7 +117,7 @@ BuildRequires: pkgconfig(zlib)
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33
%endif
%if %{with gnuefi}
%if %{with sd_boot}
BuildRequires: gnu-efi
%endif
@ -650,8 +652,12 @@ Have fun with these services at your own risk.
%if %{without coredump}
-Dcoredump=false \
%endif
%if %{without gnuefi}
%if %{without sd_boot}
-Defi=false \
-Dgnu-efi=false \
%else
-Defi=true \
-Dgnu-efi=true \
%endif
%if %{without importd}
-Dimportd=false \
@ -1365,7 +1371,7 @@ fi
%{_pam_moduledir}/pam_systemd.so
%if %{with gnuefi}
%if %{with sd_boot}
%dir %{_prefix}/lib/systemd/boot
%dir %{_prefix}/lib/systemd/boot/efi
%{_prefix}/lib/systemd/boot/efi/*.efi