packages: systemd/systemd.spec, systemd/rc.local.patch (NEW)=?UTF-8?Q?=20?=- fix for r1.1...

glen glen at pld-linux.org
Wed Mar 21 11:39:21 CET 2012 

Author: glen                         Date: Wed Mar 21 10:39:21 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix for r1.125, rename rc.local in deps to point to local service coming from rc-scripts

---- Files affected:
packages/systemd:
   systemd.spec (1.132 -> 1.133) , rc.local.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/systemd/systemd.spec
diff -u packages/systemd/systemd.spec:1.132 packages/systemd/systemd.spec:1.133
--- packages/systemd/systemd.spec:1.132	Tue Mar 20 20:25:47 2012
+++ packages/systemd/systemd.spec	Wed Mar 21 11:39:15 2012
@@ -18,7 +18,7 @@
 Summary(pl.UTF-8):	systemd - zarządca systemu i usług dla Linuksa
 Name:		systemd
 Version:	44
-Release:	3
+Release:	3.4
 License:	GPL v2+
 Group:		Base
 Source0:	http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
@@ -38,6 +38,7 @@
 Patch3:		pld-sysv-network.patch
 Patch4:		tmpfiles-not-fatal.patch
 Patch5:		CVE-2012-1174.patch
+Patch6:		rc.local.patch
 URL:		http://www.freedesktop.org/wiki/Software/systemd
 BuildRequires:	acl-devel
 %{?with_audit:BuildRequires:	audit-libs-devel}
@@ -77,7 +78,7 @@
 Requires:	dbus >= 1.4.16-6
 Requires:	filesystem >= 4.0-2
 Requires:	libutempter
-Requires:	rc-scripts >= 0.4.5.1-7
+Requires:	rc-scripts >= 0.4.5.3-6
 Requires:	setup >= 2.8.0-2
 Requires:	udev-core >= 1:175-5
 Requires:	udev-libs >= 1:172
@@ -167,6 +168,7 @@
 Summary(pl.UTF-8):	Jednostki wspierające Plymouth dla systemd
 Group:		Base
 Requires:	%{name}-units = %{version}-%{release}
+Requires:	plymouth
 
 %description plymouth
 Plymouth (graphical boot) support units for systemd.
@@ -333,6 +335,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 cp -p %{SOURCE2} src/systemd_booted.c
 
 %build
@@ -365,7 +368,7 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-./libtool --mode=install install -m755 systemd_booted $RPM_BUILD_ROOT/bin/systemd_booted
+./libtool --mode=install install -p -m755 systemd_booted $RPM_BUILD_ROOT/bin/systemd_booted
 
 # Main binary has been moved, but we don't want to break existing installs
 ln -s ../lib/systemd/systemd $RPM_BUILD_ROOT/bin/systemd
@@ -392,21 +395,25 @@
 ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/random.service
 
 # add static (non-NetworkManager) networking
-install %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/network.service
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/network.service
 
 # install compatibility tmpfiles configs
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/compat-pld-media.conf
-install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/compat-pld-var-run.conf
+cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/compat-pld-media.conf
+cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/compat-pld-var-run.conf
 
 # Install and enable storage subsystems support services (RAID, LVM, etc.)
-install %{SOURCE10} $RPM_BUILD_ROOT%{systemdunitdir}/pld-storage-init-late.service
-install %{SOURCE11} $RPM_BUILD_ROOT%{systemdunitdir}/pld-storage-init.service
-install %{SOURCE12} $RPM_BUILD_ROOT%{systemdunitdir}/pld-wait-storage.service
-install %{SOURCE13} $RPM_BUILD_ROOT/lib/systemd/pld-storage-init
+cp -p %{SOURCE10} $RPM_BUILD_ROOT%{systemdunitdir}/pld-storage-init-late.service
+cp -p %{SOURCE11} $RPM_BUILD_ROOT%{systemdunitdir}/pld-storage-init.service
+cp -p %{SOURCE12} $RPM_BUILD_ROOT%{systemdunitdir}/pld-wait-storage.service
+install -p %{SOURCE13} $RPM_BUILD_ROOT/lib/systemd/pld-storage-init
 
 ln -s ../pld-storage-init-late.service $RPM_BUILD_ROOT%{systemdunitdir}/local-fs.target.wants/pld-storage-init-late.service
 ln -s ../pld-storage-init.service $RPM_BUILD_ROOT%{systemdunitdir}/local-fs.target.wants/pld-storage-init.service
 
+# handled by rc-local sysv service, no need for generator
+%{__rm} $RPM_BUILD_ROOT/lib/systemd/system-generators/systemd-rc-local-generator
+%{__rm} $RPM_BUILD_ROOT%{systemdunitdir}/multi-user.target.wants/rc-local.service
+
 # Make sure these directories are properly owned:
 #	- halt,kexec,poweroff,reboot: generic ones used by ConsoleKit-systemd,
 #	- syslog _might_ be used by some syslog implementation (none for now),
@@ -667,7 +674,6 @@
 %config(noreplace,missingok) %{systemdunitdir}/graphical.target.wants/*
 %config(noreplace,missingok) %{systemdunitdir}/local-fs.target.wants/*
 %config(noreplace,missingok) %{systemdunitdir}/multi-user.target.wants/getty.target
-%config(noreplace,missingok) %{systemdunitdir}/multi-user.target.wants/rc-local.service
 %config(noreplace,missingok) %{systemdunitdir}/multi-user.target.wants/systemd-ask-password-wall.path
 %config(noreplace,missingok) %{systemdunitdir}/multi-user.target.wants/systemd-logind.service
 %config(noreplace,missingok) %{systemdunitdir}/multi-user.target.wants/systemd-user-sessions.service
@@ -787,6 +793,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.133  2012/03/21 10:39:15  glen
+- fix for r1.125, rename rc.local in deps to point to local service coming from rc-scripts
+
 Revision 1.132  2012/03/20 19:25:47  glen
 - systemd-analyze to subpackage; python as dependency is no longer pulled
 

================================================================
Index: packages/systemd/rc.local.patch
diff -u /dev/null packages/systemd/rc.local.patch:1.1
--- /dev/null	Wed Mar 21 11:39:21 2012
+++ packages/systemd/rc.local.patch	Wed Mar 21 11:39:15 2012
@@ -0,0 +1,55 @@
+--- systemd-44/units/plymouth-quit-wait.service~	2011-02-24 22:00:59.000000000 +0200
++++ systemd-44/units/plymouth-quit-wait.service	2012-03-21 10:11:55.023579373 +0200
+@@ -7,7 +7,7 @@
+ 
+ [Unit]
+ Description=Wait for Plymouth Boot Screen to Quit
+-After=rc-local.service plymouth-start.service
++After=local.service plymouth-start.service
+ 
+ [Service]
+ ExecStart=-/bin/plymouth --wait
+--- systemd-44/units/plymouth-quit.service~	2011-02-22 19:50:32.000000000 +0200
++++ systemd-44/units/plymouth-quit.service	2012-03-21 10:12:37.432190271 +0200
+@@ -7,7 +7,7 @@
+ 
+ [Unit]
+ Description=Terminate Plymouth Boot Screen
+-After=rc-local.service plymouth-start.service
++After=local.service plymouth-start.service
+ 
+ [Service]
+ ExecStart=-/bin/plymouth quit
+--- systemd-44/units/./serial-getty at .service.m4~	2012-03-21 10:13:37.000000000 +0200
++++ systemd-44/units/./serial-getty at .service.m4	2012-03-21 10:15:19.299611109 +0200
+@@ -13,7 +13,7 @@
+ After=rc-local.service
+ )m4_dnl
+ m4_ifdef(`TARGET_PLD',
+-After=rc-local.service
++After=local.service
+ )m4_dnl
+ m4_ifdef(`TARGET_ARCH',
+ After=rc-local.service
+--- systemd-44/units//console-shell.service.m4~	2012-03-21 10:15:55.000000000 +0200
++++ systemd-44/units//console-shell.service.m4	2012-03-21 10:16:08.138516803 +0200
+@@ -12,7 +12,7 @@
+ After=rc-local.service
+ )m4_dnl
+ m4_ifdef(`TARGET_PLD',
+-After=rc-local.service
++After=local.service
+ )m4_dnl
+ m4_ifdef(`TARGET_ARCH',
+ After=rc-local.service
+--- systemd-44/units/./getty at .service.m4~	2012-03-21 10:15:55.000000000 +0200
++++ systemd-44/units/./getty at .service.m4	2012-03-21 10:16:19.025682595 +0200
+@@ -13,7 +13,7 @@
+ After=rc-local.service
+ )m4_dnl
+ m4_ifdef(`TARGET_PLD',
+-After=rc-local.service
++After=local.service
+ )m4_dnl
+ m4_ifdef(`TARGET_ARCH',
+ After=rc-local.service
================================================================

---- CVS-web:
    http://cvs.pld-linux.org//packages/systemd/systemd.spec?r1=1.132&r2=1.133&f=u

More information about the pld-cvs-commit mailing list