From 24fbb54050b8e1f3b25261a948a11f97a5ba4e44f6e999726d8585b5e1ccb404 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 5 Sep 2016 19:16:14 +0000 Subject: [PATCH] Accepting request 424223 from Base:System 1 OBS-URL: https://build.opensuse.org/request/show/424223 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=239 --- systemd-mini.changes | 8 +++++++- systemd-mini.spec | 10 ++++++---- systemd.changes | 8 +++++++- systemd.spec | 8 +++++--- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index 5d067a28..a3a7e183 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,8 +1,14 @@ +------------------------------------------------------------------- +Wed Aug 24 12:44:24 UTC 2016 - dimstar@opensuse.org + +- Only BuildRequire gnu-efi when building the 'real' systemd + package. + ------------------------------------------------------------------- Tue Aug 23 10:12:13 UTC 2016 - fbui@suse.com - Add a script to fix /var/lib/machines to make it suitable for - rollbacks (bsc#992573992573) + rollbacks (bsc#992573) ------------------------------------------------------------------- Wed Aug 10 11:30:50 UTC 2016 - meissner@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 41bcb763..fcbbf9b6 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -76,9 +76,6 @@ BuildRequires: pkgconfig(mount) >= 2.27 %ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x BuildRequires: pkgconfig(libseccomp) %endif -%ifarch %{ix86} x86_64 -BuildRequires: gnu-efi -%endif BuildRequires: pkgconfig(libselinux) >= 2.1.9 BuildRequires: pkgconfig(libsepol) Conflicts: sysvinit @@ -89,6 +86,9 @@ Requires: this-is-only-for-build-envs Provides: systemd = %version-%release Conflicts: kiwi %else +%ifarch %{ix86} x86_64 +BuildRequires: gnu-efi +%endif BuildRequires: docbook-xsl-stylesheets BuildRequires: libgcrypt-devel BuildRequires: libxslt-tools @@ -996,7 +996,7 @@ esac # rollbacks, if needed. See bsc#992573. The installer has been fixed # to create it at installation time. if [ $1 -gt 1 ]; then - %{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh + %{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh || : fi %postun @@ -1280,12 +1280,14 @@ exit 0 /%{_lib}/security/pam_systemd.so %config /etc/pam.d/systemd-user +%if ! 0%{?bootstrap} %ifarch %{ix86} x86_64 %dir %{_prefix}/lib/systemd/boot %dir %{_prefix}/lib/systemd/boot/efi %{_prefix}/lib/systemd/boot/efi/*.efi %{_prefix}/lib/systemd/boot/efi/*.stub %endif +%endif %dir %{_libexecdir}/modules-load.d %dir %{_sysconfdir}/modules-load.d diff --git a/systemd.changes b/systemd.changes index 5d067a28..a3a7e183 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,8 +1,14 @@ +------------------------------------------------------------------- +Wed Aug 24 12:44:24 UTC 2016 - dimstar@opensuse.org + +- Only BuildRequire gnu-efi when building the 'real' systemd + package. + ------------------------------------------------------------------- Tue Aug 23 10:12:13 UTC 2016 - fbui@suse.com - Add a script to fix /var/lib/machines to make it suitable for - rollbacks (bsc#992573992573) + rollbacks (bsc#992573) ------------------------------------------------------------------- Wed Aug 10 11:30:50 UTC 2016 - meissner@suse.com diff --git a/systemd.spec b/systemd.spec index 90da8619..a3d3d79e 100644 --- a/systemd.spec +++ b/systemd.spec @@ -71,9 +71,6 @@ BuildRequires: pkgconfig(mount) >= 2.27 %ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x BuildRequires: pkgconfig(libseccomp) %endif -%ifarch %{ix86} x86_64 -BuildRequires: gnu-efi -%endif BuildRequires: pkgconfig(libselinux) >= 2.1.9 BuildRequires: pkgconfig(libsepol) Conflicts: sysvinit @@ -84,6 +81,9 @@ Requires: this-is-only-for-build-envs Provides: systemd = %version-%release Conflicts: kiwi %else +%ifarch %{ix86} x86_64 +BuildRequires: gnu-efi +%endif BuildRequires: docbook-xsl-stylesheets BuildRequires: libgcrypt-devel BuildRequires: libxslt-tools @@ -1275,12 +1275,14 @@ exit 0 /%{_lib}/security/pam_systemd.so %config /etc/pam.d/systemd-user +%if ! 0%{?bootstrap} %ifarch %{ix86} x86_64 %dir %{_prefix}/lib/systemd/boot %dir %{_prefix}/lib/systemd/boot/efi %{_prefix}/lib/systemd/boot/efi/*.efi %{_prefix}/lib/systemd/boot/efi/*.stub %endif +%endif %dir %{_libexecdir}/modules-load.d %dir %{_sysconfdir}/modules-load.d