SHA256
1
0
forked from pool/systemd
2014-03-14 11:10:20 +00:00
committed by Git OBS Bridge
parent b0c28df014
commit 5ce15b1c02
11 changed files with 429 additions and 106 deletions

View File

@@ -150,6 +150,21 @@ Source1060: boot.udev
Source1061: write_dev_root_rule
Source1062: systemd-udev-root-symlink
##############################################################################
#
# WARNING: For the case of for bootstrapping patch should not affect
# the files
#
# Makefile.am, Makefile.in, and configure.ac
#
# as this triggers an (re)autoconfigure. Please check patches with the command
#
# grep -lE 'Makefile.(am|in)|configure\.ac' *.patch
#
# to surround them with %if ! 0%{?bootstrap} ... %endif
#
##############################################################################
#
# PATCH-FIX-UPSTREAM avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch lnussel@suse.com bnc#791101 -- avoid assertion if invalid address familily is passed to gethostbyaddr_r
Patch0: avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch
# PATCH-FIX-UPSTREAM optionally-warn-if-nss-myhostname-is-called.patch lnussel@suse.com -- optionally warn if nss-myhostname is called
@@ -205,7 +220,7 @@ Patch38: rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch
# PATCH-FIX-OPENSUSE use-usr-sbin-sulogin-for-emergency-service.patch arvidjaar@gmail.com -- fix path to sulogin
Patch46: use-usr-sbin-sulogin-for-emergency-service.patch
# PATCH-FIX-OPENSUSE Make systemd talk with dbus-daemon even on big endian
Patch47: systemd-big-endian-reply-matching.patch
Patch47: 0001-sd-bus-don-t-look-for-a-64bit-value-when-we-only-hav.patch
# PATCH-FIX-OPENSUSE make-emergency.service-conflict-with-syslog.socket.patch (bnc#852232)
Patch84: make-emergency.service-conflict-with-syslog.socket.patch
# PATCH-FIX-SUSE 0001-add-hdflush-for-reboot-or-hddown-for-poweroff.patch
@@ -220,6 +235,7 @@ Patch93: 0001-Don-t-snprintf-a-potentially-NULL-pointer.patch
Patch114: 0001-systemd-empty-sigmask-on-reexec.patch
# PATCH-FIX-SUSE 0001-make-209-working-on-older-dist.patch werner@suse.com
Patch117: 0001-make-209-working-on-older-dist.patch
Patch118: 0002-make-209-working-on-older-dist.patch
# PATCH-FIX-SUSE 0001-make-fortify-happy-with-ppoll.patch werner@suse.com
Patch119: 0001-make-fortify-happy-with-ppoll.patch
# PATCH-FIX-SUSE 0001-avoid-abort-due-timeout-at-user-service.patch werner@suse.com
@@ -331,6 +347,8 @@ Patch1005: 1005-create-default-links-for-primary-cd_dvd-drive.patch
Patch1006: 1006-udev-always-rename-network.patch
# PATCH-FIX-OPENSUSE 1007-physical-hotplug-cpu-and-memory.patch
Patch1007: 1007-physical-hotplug-cpu-and-memory.patch
# PATCH-FIX-OPENSUSE 1008-add-msft-compability-rules.patch -- for code base <= 1310
Patch1008: 1008-add-msft-compability-rules.patch
%description
Systemd is a system and service manager, compatible with SysV and LSB
@@ -540,14 +558,18 @@ cp %{SOURCE7} m4/
# systemd patches
%patch0 -p1
%if ! 0%{?bootstrap}
%patch1 -p1
%endif
%patch3 -p1
# don't apply when bootstrapping to not modify configure.in
%if ! 0%{?bootstrap}
%patch4 -p1
%endif
%patch5 -p1
%if ! 0%{?bootstrap}
%patch6 -p1
%endif
%patch7 -p1
%patch8 -p1
%patch9 -p1
@@ -557,7 +579,9 @@ cp %{SOURCE7} m4/
%patch14 -p1
%patch15 -p1
%patch16 -p1
%if ! 0%{?bootstrap}
%patch17 -p1
%endif
%patch18 -p1
%patch20 -p1
%patch21 -p1
@@ -579,13 +603,19 @@ cp %{SOURCE7} m4/
%patch46 -p1
%patch47 -p1
%patch84 -p1
%if ! 0%{?bootstrap}
%patch86 -p1
%endif
%patch90 -p1
%patch91 -p1
%patch93 -p1
%patch114 -p0
%if 0%{?suse_version} <= 1310
%if ! 0%{?bootstrap}
%patch117 -p1
%else
%patch118 -p1
%endif
%endif
%patch119 -p1
%patch120 -p1
@@ -602,7 +632,9 @@ cp %{SOURCE7} m4/
%patch131 -p0
%patch132 -p0
%patch133 -p0
%if ! 0%{?bootstrap}
%patch134 -p0
%endif
%patch135 -p0
%patch136 -p0
%patch137 -p0
@@ -628,13 +660,18 @@ cp %{SOURCE7} m4/
%patch1014 -p1
%patch1018 -p1
%patch1019 -p1
%if ! 0%{?bootstrap}
%patch1020 -p1
%endif
%patch1022 -p1
%patch1023 -p1
%if ! 0%{?bootstrap}
%patch1999 -p1
%endif
%patch2000 -p1
## DISABLED ... does not work even on little endian
##%patch2001 -p1
%if ! 0%{?bootstrap}
%patch2001 -p1
%endif
# udev patches
%patch1034 -p0
%patch1035 -p0
@@ -647,12 +684,19 @@ cp %{SOURCE7} m4/
%if ! 0%{?bootstrap}
%patch1007 -p1
%endif
%if 0%{?suse_version} <= 1310
%if ! 0%{?bootstrap}
%patch1008 -p1
%endif
%endif
# ensure generate files are removed
rm -f units/emergency.service
%build
%if ! 0%{?bootstrap}
autoreconf -fiv
%endif
# prevent pre-generated and distributed files from re-building
find . -name "*.[1-8]" -exec touch '{}' '+';
export V=1
@@ -1109,7 +1153,8 @@ exit 0
%dir %{_prefix}/lib/systemd/user
%dir %{_prefix}/lib/systemd/system
%exclude %{_prefix}/lib/systemd/system/systemd-udev*.*
%exclude %{_prefix}/lib/systemd/system/*udev*.service
%exclude %{_prefix}/lib/systemd/system/udev.service
%exclude %{_prefix}/lib/systemd/system/initrd-udevadm-cleanup-db.service
%exclude %{_prefix}/lib/systemd/system/systemd-udev-root-symlink.service
%exclude %{_prefix}/lib/systemd/system/*.target.wants/systemd-udev*.*
%exclude %{_prefix}/lib/systemd/system/basic.target.wants/systemd-udev-root-symlink.service
@@ -1180,12 +1225,12 @@ exit 0
%dir %{_sysconfdir}/systemd/system
%dir %{_sysconfdir}/systemd/user
%dir %{_sysconfdir}/xdg/systemd
%dir %{_sysconfdir}/dbus-1
%dir %{_sysconfdir}/dbus-1/system.d
%exclude %dir %{_sysconfdir}/dbus-1
%exclude %dir %{_sysconfdir}/dbus-1/system.d
%{_sysconfdir}/xdg/systemd/user
%dir %{_datadir}/dbus-1
%dir %{_datadir}/dbus-1/services
%dir %{_datadir}/dbus-1/system-services
%exclude %dir %{_datadir}/dbus-1
%exclude %dir %{_datadir}/dbus-1/services
%exclude %dir %{_datadir}/dbus-1/system-services
%config(noreplace) %{_sysconfdir}/systemd/bootchart.conf
%config(noreplace) %{_sysconfdir}/systemd/system.conf
%config(noreplace) %{_sysconfdir}/systemd/logind.conf