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

Accepting request 422120 from home:dimstar:Factory

Browse Source 
- Only BuildRequire gnu-efi when building the 'real' systemd
  package.

  rollbacks (bsc#992573)
- Only BuildRequire gnu-efi when building the 'real' systemd
  package.

  rollbacks (bsc#992573)

OBS-URL: https://build.opensuse.org/request/show/422120
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=947
This commit is contained in:
Marcus Meissner 2016-09-01 11:58:03 +00:00 committed by Git OBS Bridge
parent 08d13164a4
commit 190b7ddb3e
4 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
systemd-mini.changes
View File

@ -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 Tue Aug 23 10:12:13 UTC 2016 - fbui@suse.com
- Add a script to fix /var/lib/machines to make it suitable for - 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 Wed Aug 10 11:30:50 UTC 2016 - meissner@suse.com

10
systemd-mini.spec
View File

@ -76,9 +76,6 @@ BuildRequires: pkgconfig(mount) >= 2.27
%ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x %ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x
BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libseccomp)
%endif %endif
%ifarch %{ix86} x86_64
BuildRequires: gnu-efi
%endif
BuildRequires: pkgconfig(libselinux) >= 2.1.9 BuildRequires: pkgconfig(libselinux) >= 2.1.9
BuildRequires: pkgconfig(libsepol) BuildRequires: pkgconfig(libsepol)
Conflicts: sysvinit Conflicts: sysvinit
@ -89,6 +86,9 @@ Requires: this-is-only-for-build-envs
Provides: systemd = %version-%release Provides: systemd = %version-%release
Conflicts: kiwi Conflicts: kiwi
%else %else
%ifarch %{ix86} x86_64
BuildRequires: gnu-efi
%endif
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
BuildRequires: libgcrypt-devel BuildRequires: libgcrypt-devel
BuildRequires: libxslt-tools BuildRequires: libxslt-tools
@ -996,7 +996,7 @@ esac
# rollbacks, if needed. See bsc#992573. The installer has been fixed # rollbacks, if needed. See bsc#992573. The installer has been fixed
# to create it at installation time. # to create it at installation time.
if [ $1 -gt 1 ]; then if [ $1 -gt 1 ]; then
%{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh %{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh || :
fi fi
%postun %postun
@ -1280,12 +1280,14 @@ exit 0
/%{_lib}/security/pam_systemd.so /%{_lib}/security/pam_systemd.so
%config /etc/pam.d/systemd-user %config /etc/pam.d/systemd-user
%if ! 0%{?bootstrap}
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
%dir %{_prefix}/lib/systemd/boot %dir %{_prefix}/lib/systemd/boot
%dir %{_prefix}/lib/systemd/boot/efi %dir %{_prefix}/lib/systemd/boot/efi
%{_prefix}/lib/systemd/boot/efi/*.efi %{_prefix}/lib/systemd/boot/efi/*.efi
%{_prefix}/lib/systemd/boot/efi/*.stub %{_prefix}/lib/systemd/boot/efi/*.stub
%endif %endif
%endif
%dir %{_libexecdir}/modules-load.d %dir %{_libexecdir}/modules-load.d
%dir %{_sysconfdir}/modules-load.d %dir %{_sysconfdir}/modules-load.d

8
systemd.changes
View File

@ -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 Tue Aug 23 10:12:13 UTC 2016 - fbui@suse.com
- Add a script to fix /var/lib/machines to make it suitable for - 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 Wed Aug 10 11:30:50 UTC 2016 - meissner@suse.com

8
systemd.spec
View File

@ -71,9 +71,6 @@ BuildRequires: pkgconfig(mount) >= 2.27
%ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x %ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x
BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libseccomp)
%endif %endif
%ifarch %{ix86} x86_64
BuildRequires: gnu-efi
%endif
BuildRequires: pkgconfig(libselinux) >= 2.1.9 BuildRequires: pkgconfig(libselinux) >= 2.1.9
BuildRequires: pkgconfig(libsepol) BuildRequires: pkgconfig(libsepol)
Conflicts: sysvinit Conflicts: sysvinit
@ -84,6 +81,9 @@ Requires: this-is-only-for-build-envs
Provides: systemd = %version-%release Provides: systemd = %version-%release
Conflicts: kiwi Conflicts: kiwi
%else %else
%ifarch %{ix86} x86_64
BuildRequires: gnu-efi
%endif
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
BuildRequires: libgcrypt-devel BuildRequires: libgcrypt-devel
BuildRequires: libxslt-tools BuildRequires: libxslt-tools
@ -1275,12 +1275,14 @@ exit 0
/%{_lib}/security/pam_systemd.so /%{_lib}/security/pam_systemd.so
%config /etc/pam.d/systemd-user %config /etc/pam.d/systemd-user
%if ! 0%{?bootstrap}
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
%dir %{_prefix}/lib/systemd/boot %dir %{_prefix}/lib/systemd/boot
%dir %{_prefix}/lib/systemd/boot/efi %dir %{_prefix}/lib/systemd/boot/efi
%{_prefix}/lib/systemd/boot/efi/*.efi %{_prefix}/lib/systemd/boot/efi/*.efi
%{_prefix}/lib/systemd/boot/efi/*.stub %{_prefix}/lib/systemd/boot/efi/*.stub
%endif %endif
%endif
%dir %{_libexecdir}/modules-load.d %dir %{_libexecdir}/modules-load.d
%dir %{_sysconfdir}/modules-load.d %dir %{_sysconfdir}/modules-load.d