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

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=529
This commit is contained in:
Dr. Werner Fink
2014-03-03 14:25:26 +00:00
committed by Git OBS Bridge
parent b310745ef0
commit 3fb99bb7e1
28 changed files with 1140 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
systemd-mini.spec
View File

@@ -29,7 +29,7 @@
Name: systemd-mini
Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 209
Version: 210
Release: 0
Summary: A System and Session Manager
License: LGPL-2.1+
@@ -97,8 +97,10 @@ BuildRequires: pkgconfig(libqrencode)
BuildRequires: pkgconfig(usbutils) >= 0.82
%endif
%if 0%{?suse_version} > 1310
%ifarch %ix86 x86_64 x32 %arm
BuildRequires: pkgconfig(libseccomp)
%endif
%endif
BuildRequires: pkgconfig(libselinux) >= 2.1.9
BuildRequires: pkgconfig(libsepol)
%if 0%{?bootstrap}
@@ -202,8 +204,6 @@ Patch25: Forward-suspend-hibernate-calls-to-pm-utils.patch
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 systemd-dbus-system-bus-address.patch always use /run/dbus not /var/run
Patch47: systemd-dbus-system-bus-address.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
@@ -216,26 +216,38 @@ Patch91: plymouth-quit-and-wait-for-emergency-service.patch
Patch93: 0001-Don-t-snprintf-a-potentially-NULL-pointer.patch
# PATCH-FIX-SUSE 0001-systemd-empty-sigmask-on-reexec.patch werner@suse.com
Patch114: 0001-systemd-empty-sigmask-on-reexec.patch
# PATCH-FIX-SUSE 0001-add-network-device-after-NFS-mount-units.patch werner@suse.com
Patch115: 0001-add-network-device-after-NFS-mount-units.patch
# PATCH-FIX-USTREAM 0001-units-serial-getty-.service-add-Install-section.patch werner@suse.com
Patch116: 0001-units-serial-getty-.service-add-Install-section.patch
# PATCH-FIX-SUSE 0001-make-209-working-on-older-dist.patch werner@suse.com
Patch117: 0001-make-209-working-on-older-dist.patch
# PATCH-FIX-SUSE 0001-make-tests-with-libseccomp-work.patch werner@suse.com
Patch118: 0001-make-tests-with-libseccomp-work.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
Patch120: 0001-avoid-abort-due-timeout-at-user-service.patch
# PATCH-FIX-USTREAM 0001-nspawn-fix-detection-of-missing-proc-self-loginuid.patch werner@suse.com
# PATCH-FIX-USTREAM added at 2014/0303
Patch121: 0001-nspawn-fix-detection-of-missing-proc-self-loginuid.patch
# PATCH-FIX-USTREAM 0001-cdrom_id-use-the-old-MMC-fallback.patch
Patch122: 0001-cdrom_id-use-the-old-MMC-fallback.patch
# PATCH-FIX-USTREAM 0001-logs-show-fix-corrupt-output-with-empty-messages.patch
Patch123: 0001-logs-show-fix-corrupt-output-with-empty-messages.patch
# PATCH-FIX-USTREAM 0001-journalctl-refuse-extra-arguments-with-verify-and-si.patch
Patch124: 0001-journalctl-refuse-extra-arguments-with-verify-and-si.patch
# PATCH-FIX-USTREAM added at 2014/0303
Patch122: 0003-journalctl-refuse-extra-arguments-with-verify-and-si.patch
# PATCH-FIX-USTREAM added at 2014/0303
Patch123: 0004-logs-show-fix-corrupt-output-with-empty-messages.patch
# PATCH-FIX-USTREAM added at 2014/0303
Patch124: 0005-mount-don-t-fire-PropertiesChanged-signals-for-mount.patch
# PATCH-FIX-USTREAM added at 2014/0303
Patch125: 0006-mount-don-t-send-out-PropertiesChanged-message-if-ac.patch
# PATCH-FIX-USTREAM added at 2014/0303
Patch126: 0007-Use-var-run-dbus-system_bus_socket-for-the-D-Bus-soc.patch
# PATCH-FIX-USTREAM added at 2014/0303
Patch127: 0008-README-document-that-var-run-must-be-a-symlink-run.patch
# PATCH-FIX-USTREAM added at 2014/0303
Patch128: 0010-Replace-var-run-with-run-in-remaining-places.patch
# PATCH-FIX-USTREAM added at 2014/0303
Patch129: 0009-Revert-back-to-var-run-at-a-couple-of-problems.patch
# PATCH-FIX-USTREAM added at 2014/0303
Patch130: 0011-fix-typo-in-iDRAC-network-interface-name-irdac-idrac.patch
# PATCH-FIX-USTREAM added at 2014/0303
Patch131: 0012-login-Allow-calling-org.freedesktop.login1.Seat.Swit.patch
# PATCH-FIX-USTREAM added at 2014/0303
Patch132: 0013-login-set-pos-slot-to-fallback-on-pos-eviction.patch
# PATCH-FIX-USTREAM added at 2014/0303
Patch133: 0014-login-fix-pos-array-allocation.patch
# PATCH-FIX-OPENSUSE 1009-make-xsltproc-use-correct-ROFF-links.patch -- Make ROFF links working again in manual pages (bnc#842844)
Patch1009: 1009-make-xsltproc-use-correct-ROFF-links.patch
# PATCH-FIX-OPENSUSE 1010-do-not-install-sulogin-unit-with-poweroff.patch -- Avoid installing console-shell.service (bnc#849071)
@@ -250,8 +262,16 @@ Patch1016: 1016-support-powerfail-with-powerstatus.patch
Patch1018: 1018-Make-LSB-Skripts-know-about-Required-and-Should.patch
# PATCH-FIX-SUSE 1019-make-completion-smart-to-be-able-to-redirect.patch
Patch1019: 1019-make-completion-smart-to-be-able-to-redirect.patch
# PATCH-FIX-SUSE 0001-add-network-device-after-NFS-mount-units.patch werner@suse.com
Patch1020: 0001-add-network-device-after-NFS-mount-units.patch
# PATCH-FIX-SUSE systemd-dbus-system-bus-address.patch
Patch1021: systemd-dbus-system-bus-address.patch
# PATCH-FIX-SUSE systemd-install-compat_pkgconfig-always.patch
Patch1999: systemd-install-compat_pkgconfig-always.patch
# udev patches
# PATCH-FIX-USTREAM added at 2014/0303
Patch134: 0002-cdrom_id-use-the-old-MMC-fallback.patch
# PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch
Patch1001: 1001-re-enable-by_path-links-for-ata-devices.patch
# PATCH-FIX-OPENSUSE 1002-rules-create-by-id-scsi-links-for-ATA-devices.patch
@@ -509,25 +529,30 @@ cp %{SOURCE7} m4/
%patch41 -p1
%patch42 -p1
%patch46 -p1
%patch47 -p1
%patch84 -p1
%patch86 -p1
%patch90 -p1
%patch91 -p1
%patch93 -p1
%patch114 -p0
%patch115 -p1
%patch116 -p1
%if 0%{?suse_version} <= 1310
%patch117 -p1
%endif
%patch118 -p1
%patch119 -p1
%patch120 -p1
%patch121 -p0
%patch122 -p0
%patch123 -p0
%patch124 -p0
%patch125 -p0
%patch126 -p0
%patch127 -p0
%patch128 -p0
%patch129 -p0
%patch130 -p0
%patch131 -p0
%patch132 -p0
%patch133 -p0
%patch1009 -p1
%patch1010 -p1
%patch1012 -p1
@@ -535,13 +560,16 @@ cp %{SOURCE7} m4/
%patch1016 -p1
%patch1018 -p1
%patch1019 -p1
%patch1020 -p1
%patch1021 -p1
%patch1999 -p1
# udev patches
%patch134 -p0
%patch1001 -p1
%patch1002 -p1
%patch1003 -p1
%patch1005 -p1
#%patch1006 -p1 -b .xy
# don't apply when bootstrapping to not modify Makefile.am
%if ! 0%{?bootstrap}
%patch1007 -p1
@@ -563,6 +591,7 @@ export V=1
%if 0%{?bootstrap}
--disable-gudev \
--disable-myhostname \
--disable-manpages \
%else
--enable-manpages \
%if %{with python}
@@ -570,9 +599,9 @@ export V=1
%endif
--enable-gtk-doc \
--with-nss-my-hostname-warning \
%endif
%if %{with compat_libs}
--enable-compat-libs \
%endif
%endif
--enable-selinux \
--enable-split-usr \
@@ -594,12 +623,6 @@ make %{?_smp_mflags}
%install
make install DESTDIR="%buildroot"
%if %{without python}
for man in systemd.directives.7 systemd.index.7
do
install -m 0644 man/$man %{buildroot}%{_mandir}/man7/
done
%endif
# move to %{_lib}
%if ! 0%{?bootstrap}
@@ -694,7 +717,7 @@ rm -f %{buildroot}%{_prefix}/lib/sysctl.d/50-default.conf
# remove README file for now
rm -f %{buildroot}/etc/init.d/README
%if 0%{?bootstrap}
rm -f %{buildroot}/var/log/README
rm -f %{buildroot}%{_localstatedir}/log/README
rm -rf %{buildroot}%{_datadir}/bash-completion
%endif
@@ -708,13 +731,13 @@ done
ln -s /usr/lib/udev %{buildroot}/lib/udev
# Create the /var/log/journal directory to change the volatile journal to a persistent one
mkdir -p %{buildroot}/var/log/journal
mkdir -p %{buildroot}%{_localstatedir}/log/journal
# Make sure directories in /var exist
mkdir -p %{buildroot}/var/lib/systemd/coredump
mkdir -p %{buildroot}/var/lib/systemd/catalog
mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/coredump
mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/catalog
#create ghost databases
touch %{buildroot}/var/lib/systemd/catalog/database
touch %{buildroot}%{_localstatedir}/lib/systemd/catalog/database
touch %{buildroot}%{_sysconfdir}/udev/hwdb.bin
# Make sure the NTP units dir exists
@@ -745,7 +768,16 @@ install -m 755 %{S:12} %{buildroot}/%{_prefix}/lib/systemd/
install -m 644 units/powerfail.service %{buildroot}/%{_prefix}/lib/systemd/system/
%if ! 0%{?bootstrap}
install -m 644 man/systemd-powerfail.service.8 %{buildroot}/%{_mandir}/man8/
%if %{without python}
for man in systemd.directives.7 systemd.index.7
do
install -m 0644 man/$man %{buildroot}%{_mandir}/man7/
done
%endif
%endif
mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/backlight
mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/random-seed
%fdupes -s %{buildroot}%{_mandir}
@@ -763,14 +795,14 @@ exit 0
/usr/sbin/pam-config -a --systemd || :
%endif
/sbin/ldconfig
[ -e /var/lib/random-seed ] && mv /var/lib/random-seed /var/lib/systemd/ > /dev/null || :
[ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ > /dev/null || :
/usr/bin/systemd-machine-id-setup >/dev/null 2>&1 || :
/usr/lib/systemd/systemd-random-seed save >/dev/null 2>&1 || :
/usr/bin/systemctl daemon-reexec >/dev/null 2>&1 || :
/usr/bin/journalctl --update-catalog >/dev/null 2>&1 || :
# Make sure new journal files
chgrp systemd-journal /var/log/journal/ /var/log/journal/`cat /etc/machine-id 2> /dev/null` >/dev/null 2>&1 || :
chmod g+s /var/log/journal/ /var/log/journal/`cat /etc/machine-id 2> /dev/null` >/dev/null 2>&1 || :
chgrp systemd-journal %{_localstatedir}/log/journal/ %{_localstatedir}/log/journal/`cat /etc/machine-id 2> /dev/null` >/dev/null 2>&1 || :
chmod g+s %{_localstatedir}/log/journal/ %{_localstatedir}/log/journal/`cat /etc/machine-id 2> /dev/null` >/dev/null 2>&1 || :
# Try to read default runlevel from the old inittab if it exists
if [ ! -e /etc/systemd/system/default.target -a -e /etc/inittab ]; then
@@ -869,9 +901,9 @@ if test -f /proc/1/exe -a -d /proc/1/root; then
fi
if [ "${YAST_IS_RUNNING}" != "instsys" ]; then
if [ -e /var/lib/no_initrd_recreation_by_suspend ]; then
if [ -e %{_localstatedir}/lib/no_initrd_recreation_by_suspend ]; then
echo "Skipping recreation of existing initial ramdisks, due"
echo "to presence of /var/lib/no_initrd_recreation_by_suspend"
echo "to presence of %{_localstatedir}/lib/no_initrd_recreation_by_suspend"
elif [ -x /sbin/mkinitrd ]; then
[ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup
/sbin/mkinitrd || :
@@ -883,9 +915,9 @@ fi
systemctl daemon-reload >/dev/null 2>&1 || :
if [ "${YAST_IS_RUNNING}" != "instsys" ]; then
if [ -e /var/lib/no_initrd_recreation_by_suspend ]; then
if [ -e %{_localstatedir}/lib/no_initrd_recreation_by_suspend ]; then
echo "Skipping recreation of existing initial ramdisks, due"
echo "to presence of /var/lib/no_initrd_recreation_by_suspend"
echo "to presence of %{_localstatedir}/lib/no_initrd_recreation_by_suspend"
elif [ -x /sbin/mkinitrd ]; then
[ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup
/sbin/mkinitrd || :
@@ -918,7 +950,7 @@ fi
%postun -n nss-myhostname -p /sbin/ldconfig
%pre journal-gateway
getent passwd systemd-journal-gateway >/dev/null || useradd -r -l -g systemd-journal-gateway -d /var/log/journal -s /usr/sbin/nologin -c "Journal Gateway" systemd-journal-gateway >/dev/null 2>&1 || :
getent passwd systemd-journal-gateway >/dev/null || useradd -r -l -g systemd-journal-gateway -d %{_localstatedir}/log/journal -s /usr/sbin/nologin -c "Journal Gateway" systemd-journal-gateway >/dev/null 2>&1 || :
getent group systemd-journal-gateway >/dev/null || groupadd -r systemd-journal-gateway || :
%service_add_pre systemd-journal-gatewayd.socket systemd-journal-gatewayd.service
exit 0
@@ -987,7 +1019,9 @@ exit 0
%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
%if ! 0%{?bootstrap}
%exclude %{_prefix}/lib/systemd/system/systemd-journal-gatewayd.*
%endif
%{_prefix}/lib/systemd/system/*.automount
%{_prefix}/lib/systemd/system/*.busname
%{_prefix}/lib/systemd/system/*.service
@@ -1001,7 +1035,9 @@ exit 0
%{_prefix}/lib/systemd/user/*.target
%{_prefix}/lib/systemd/user/*.service
%exclude %{_prefix}/lib/systemd/systemd-udevd
%if ! 0%{?bootstrap}
%exclude %{_prefix}/lib/systemd/systemd-journal-gatewayd
%endif
%{_prefix}/lib/systemd/systemd-*
%{_prefix}/lib/systemd/systemd
%dir %{_prefix}/lib/systemd/catalog
@@ -1077,7 +1113,9 @@ exit 0
%{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy
%{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy
%{_datadir}/polkit-1/actions/org.freedesktop.login1.policy
%if ! 0%{?bootstrap}
%exclude %{_datadir}/systemd/gatewayd
%endif
%{_datadir}/systemd
%{_datadir}/locale/*/LC_MESSAGES
@@ -1112,17 +1150,17 @@ exit 0
%if 0%{suse_version} < 1310
%{_sysconfdir}/rpm/macros.systemd
%endif
%dir /var/lib/systemd
%dir /var/lib/systemd/sysv-convert
%dir /var/lib/systemd/migrated
%dir /var/lib/systemd/catalog
%ghost /var/lib/systemd/catalog/database
%dir /var/lib/systemd/coredump
%dir /usr/share/zsh
%dir /usr/share/zsh/site-functions
/usr/share/zsh/site-functions/*
%ghost /var/lib/systemd/backlight
%ghost /var/lib/systemd/random-seed
%dir %{_localstatedir}/lib/systemd
%dir %{_localstatedir}/lib/systemd/sysv-convert
%dir %{_localstatedir}/lib/systemd/migrated
%dir %{_localstatedir}/lib/systemd/catalog
%ghost %{_localstatedir}/lib/systemd/catalog/database
%dir %{_localstatedir}/lib/systemd/coredump
%dir %{_datadir}/zsh
%dir %{_datadir}/zsh/site-functions
%{_datadir}/zsh/site-functions/*
%ghost %{_localstatedir}/lib/systemd/backlight
%ghost %{_localstatedir}/lib/systemd/random-seed
%if ! 0%{?bootstrap}
%files bash-completion
@@ -1153,12 +1191,10 @@ exit 0
%{_includedir}/systemd/_sd-common.h
%{_datadir}/pkgconfig/systemd.pc
%{_libdir}/pkgconfig/libsystemd.pc
%if %{with compat_libs}
%{_libdir}/pkgconfig/libsystemd-daemon.pc
%{_libdir}/pkgconfig/libsystemd-login.pc
%{_libdir}/pkgconfig/libsystemd-id128.pc
%{_libdir}/pkgconfig/libsystemd-journal.pc
%endif
%files sysvinit
%defattr(-,root,root,-)
@@ -1225,6 +1261,7 @@ exit 0
%{_prefix}/lib/systemd/system/sockets.target.wants/systemd-udev*.socket
%dir %{_prefix}/lib/systemd/network
%{_prefix}/lib/systemd/network/*.link
%{_prefix}/lib/systemd/network/*.network
%files -n lib%{udevpkgname}%{udev_major}
%defattr(-,root,root)
@@ -1267,8 +1304,8 @@ exit 0
%files logger
%defattr(-,root,root)
%dir /var/log/journal
/var/log/README
%dir %{_localstatedir}/log/journal
%{_localstatedir}/log/README
/etc/init.d/systemd-journald
%files -n nss-myhostname