packages: plymouth/plymouth.spec, plymouth/systemd-ask-password-plymouth.pa...

baggins baggins at pld-linux.org
Thu Jun 21 13:43:04 CEST 2012 

Author: baggins                      Date: Thu Jun 21 11:43:04 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- systemd services have been removed from systemd and moved here,
  install them as they were and restore missing ask-password

---- Files affected:
packages/plymouth:
   plymouth.spec (1.28 -> 1.29) , systemd-ask-password-plymouth.path (NONE -> 1.1)  (NEW), systemd-ask-password-plymouth.service (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/plymouth/plymouth.spec
diff -u packages/plymouth/plymouth.spec:1.28 packages/plymouth/plymouth.spec:1.29
--- packages/plymouth/plymouth.spec:1.28	Thu Jun 14 16:40:53 2012
+++ packages/plymouth/plymouth.spec	Thu Jun 21 13:42:59 2012
@@ -2,6 +2,8 @@
 # TODO
 # - integrate with geninitrd
 # - pldize recent update (r1.18)
+# - verify if systemd services have to be installed for targets,
+#	and remove the symlinks if not
 #
 # Conditional build:
 %bcond_without	drm_intel	# disable building with libdrm_intel support
@@ -25,6 +27,8 @@
 Source4:	boot-duration
 Source5:	%{name}-set-default-plugin
 Source6:	%{name}-update-initrd
+Source7:	systemd-ask-password-plymouth.path
+Source8:	systemd-ask-password-plymouth.service
 Patch0:		text-colors.patch
 URL:		http://www.freedesktop.org/wiki/Software/Plymouth
 BuildRequires:	cairo-devel
@@ -38,9 +42,10 @@
 Requires:	%{name}-graphics-libs = %{version}-%{release}
 Requires(post):	%{name}-scripts = %{version}-%{release}
 Requires:	/etc/os-release
-Requires:	systemd-plymouth
+Requires:	systemd-units
 Obsoletes:	plymouth-gdm-hooks
 Obsoletes:	plymouth-utils
+Obsoletes:	systemd-plymouth
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		plymouthdaemon_execdir	/sbin
@@ -370,6 +375,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_pixmapsdir},%{systemdtmpfilesdir}}
+
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
@@ -403,6 +409,21 @@
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_pixmapsdir}/plymouth-logo.png
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
+cp -p %{SOURCE7} $RPM_BUILD_ROOT%{systemdunitdir}/systemd-ask-password-plymouth.path
+cp -p %{SOURCE8} $RPM_BUILD_ROOT%{systemdunitdir}/systemd-ask-password-plymouth.service
+
+# install plymouth services for targets
+# http://cgit.freedesktop.org/systemd/systemd/commit/?id=26cbf29c52a36b6ad9d1ccc16d8f7adccefeddca
+install -d $RPM_BUILD_ROOT%{systemdunitdir}/{halt,kexec,poweroff,reboot,sysinit,multi-user}.target.wants
+ln -sf ../plymouth-start.service $RPM_BUILD_ROOT%{systemdunitdir}/sysinit.target.wants/plymouth-start.service
+ln -sf ../plymouth-read-write.service $RPM_BUILD_ROOT%{systemdunitdir}/sysinit.target.wants/plymouth-read-write.service
+ln -sf ../plymouth-quit.service $RPM_BUILD_ROOT%{systemdunitdir}/multi-user.target.wants/plymouth-quit.service
+ln -sf ../plymouth-quit-wait.service $RPM_BUILD_ROOT%{systemdunitdir}/multi-user.target.wants/plymouth-quit-wait.service
+ln -sf ../plymouth-reboot.service $RPM_BUILD_ROOT%{systemdunitdir}/reboot.target.wants/plymouth-reboot.service
+ln -sf ../plymouth-kexec.service $RPM_BUILD_ROOT%{systemdunitdir}/kexec.target.wants/plymouth-kexec.service
+ln -sf ../plymouth-poweroff.service $RPM_BUILD_ROOT%{systemdunitdir}/poweroff.target.wants/plymouth-poweroff.service
+ln -sf ../plymouth-halt.service $RPM_BUILD_ROOT%{systemdunitdir}/halt.target.wants/plymouth-halt.service
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -443,15 +464,25 @@
 %ghost %{_localstatedir}/lib/plymouth/boot-duration
 %{_localstatedir}/run/plymouth
 %{_localstatedir}/spool/plymouth
-# currently packaged in systemd-plymouth
-#%{systemdunitdir}/plymouth-halt.service
-#%{systemdunitdir}/plymouth-kexec.service
-#%{systemdunitdir}/plymouth-poweroff.service
-#%{systemdunitdir}/plymouth-quit-wait.service
-#%{systemdunitdir}/plymouth-quit.service
-#%{systemdunitdir}/plymouth-read-write.service
-#%{systemdunitdir}/plymouth-reboot.service
-#%{systemdunitdir}/plymouth-start.service
+
+%{systemdunitdir}/plymouth-halt.service
+%{systemdunitdir}/plymouth-kexec.service
+%{systemdunitdir}/plymouth-poweroff.service
+%{systemdunitdir}/plymouth-quit-wait.service
+%{systemdunitdir}/plymouth-quit.service
+%{systemdunitdir}/plymouth-read-write.service
+%{systemdunitdir}/plymouth-reboot.service
+%{systemdunitdir}/plymouth-start.service
+%{systemdunitdir}/systemd-ask-password-plymouth.path
+%{systemdunitdir}/systemd-ask-password-plymouth.service
+%{systemdunitdir}/halt.target.wants/plymouth-halt.service
+%{systemdunitdir}/kexec.target.wants/plymouth-kexec.service
+%{systemdunitdir}/multi-user.target.wants/plymouth-quit.service
+%{systemdunitdir}/multi-user.target.wants/plymouth-quit-wait.service
+%{systemdunitdir}/poweroff.target.wants/plymouth-poweroff.service
+%{systemdunitdir}/reboot.target.wants/plymouth-reboot.service
+%{systemdunitdir}/sysinit.target.wants/plymouth-read-write.service
+%{systemdunitdir}/sysinit.target.wants/plymouth-start.service
 
 %files core-libs
 %defattr(644,root,root,755)
@@ -566,6 +597,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2012/06/21 11:42:59  baggins
+- systemd services have been removed from systemd and moved here,
+  install them as they were and restore missing ask-password
+
 Revision 1.28  2012/06/14 14:40:53  qboosh
 - updated to 0.8.5.1
 - removed obsolete check_for_consoles patch

================================================================
Index: packages/plymouth/systemd-ask-password-plymouth.path
diff -u /dev/null packages/plymouth/systemd-ask-password-plymouth.path:1.1
--- /dev/null	Thu Jun 21 13:43:04 2012
+++ packages/plymouth/systemd-ask-password-plymouth.path	Thu Jun 21 13:42:59 2012
@@ -0,0 +1,20 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Forward Password Requests to Plymouth Directory Watch
+Documentation=http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents
+DefaultDependencies=no
+Conflicts=shutdown.target
+After=plymouth-start.service
+Before=basic.target shutdown.target
+ConditionKernelCommandLine=!plymouth.enable=0
+ConditionPathExists=/run/plymouth/pid
+
+[Path]
+DirectoryNotEmpty=/run/systemd/ask-password
+MakeDirectory=yes

================================================================
Index: packages/plymouth/systemd-ask-password-plymouth.service
diff -u /dev/null packages/plymouth/systemd-ask-password-plymouth.service:1.1
--- /dev/null	Thu Jun 21 13:43:04 2012
+++ packages/plymouth/systemd-ask-password-plymouth.service	Thu Jun 21 13:42:59 2012
@@ -0,0 +1,19 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Forward Password Requests to Plymouth
+Documentation=http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents
+DefaultDependencies=no
+Conflicts=shutdown.target
+After=plymouth-start.service
+Before=shutdown.target
+ConditionKernelCommandLine=!plymouth.enable=0
+ConditionPathExists=/run/plymouth/pid
+
+[Service]
+ExecStart=/bin/systemd-tty-ask-password-agent --watch --plymouth
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/plymouth/plymouth.spec?r1=1.28&r2=1.29

More information about the pld-cvs-commit mailing list