Install the upstream systemd service file

Since wpa_supplicant is dbus-activated by connman under systemd, the
service file needs to be installed.

This commit installs the base systemd service file.  The other three
service files should not be needed unless there are required
driver-specific overrides not supported by connman.

Change-Id: I11d0d0f03b75c2fd67cd0969c42e76e1a717f77a
Signed-off-by: Patrick McCarty <patrick.mccarty@linux.intel.com>

diff --git a/packaging/wpa_supplicant.changes b/packaging/wpa_supplicant.changes
index d900594..1509f9f 100644 (file)
--- a/packaging/wpa_supplicant.changes
+++ b/packaging/wpa_supplicant.changes
@@ -1,3 +1,6 @@
+* Fri Jul 13 2012 Patrick McCarty <patrick.mccarty@linux.intel.com> 8451b2f
+- Install the upstream systemd service file
+
 * Fri Jun 15 2012 Chris Leech <christopher.leech@linux.intel.com> - 0.8.0
 - move dbus files from /usr/etc to /etc
 

diff --git a/packaging/wpa_supplicant.spec b/packaging/wpa_supplicant.spec
index 32edddd..8f42220 100644 (file)
--- a/packaging/wpa_supplicant.spec
+++ b/packaging/wpa_supplicant.spec
@@ -54,6 +54,12 @@ ln -s ../init.d/wpa_supplicant %{buildroot}%{_sysconfdir}/rc.d/rc5.d/S62wpasuppl
 mkdir -p %{buildroot}%{_datadir}/doc/wpasupplicant
 sed 's/^\([^#]\+=.*\|}\)/#\1/' < ./wpa_supplicant.conf | gzip > %{buildroot}%{_datadir}/doc/wpasupplicant/README.wpa_supplicant.conf.gz
 
+# install systemd service file
+mkdir -p %{buildroot}%{_libdir}/systemd/system
+install -m 0644 systemd/wpa_supplicant.service %{buildroot}%{_libdir}/systemd/system/
+mkdir -p %{buildroot}%{_libdir}/systemd/system/network.target.wants
+ln -s ../wpa_supplicant.service %{buildroot}%{_libdir}/systemd/system/network.target.wants/wpa_supplicant.service
+
 rm -rf %{buildroot}%{_sbindir}/systemd/
 rm -rf %{buildroot}%{_sbindir}/dbus/
 rm -rf %{buildroot}%{_sbindir}/wpa_passphrase
@@ -73,3 +79,5 @@ rm -rf %{buildroot}%{_sbindir}/wpa_passphrase
 %{_sysconfdir}/rc.d/init.d/wpa_supplicant
 %{_sysconfdir}/rc.d/rc3.d/S62wpasupplicant
 %{_sysconfdir}/rc.d/rc5.d/S62wpasupplicant
+%{_libdir}/systemd/system/wpa_supplicant.service
+%{_libdir}/systemd/system/network.target.wants/wpa_supplicant.service