[gnome-ostree] 3.6: Install wpa_supplicant systemd unit

[Colin Walters <walters src gnome org>]

commit ef6fe080f6507133571596ed7011631df5410186
Author: Colin Walters <walters verbum org>
Date:   Sun Sep 16 12:35:25 2012 -0400

    3.6: Install wpa_supplicant systemd unit
    
    https://bugzilla.gnome.org/show_bug.cgi?id=684052

 gnomeos-3.6.json                                   |    3 +-
 ...Install-systemd-units-if-configured-to-do.patch |   50 ++++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletions(-)
---
diff --git a/gnomeos-3.6.json b/gnomeos-3.6.json
index b3bd592..2abfc52 100644
--- a/gnomeos-3.6.json
+++ b/gnomeos-3.6.json
@@ -450,7 +450,8 @@
 		 "tag": "b80eb89d8e21eb699d847bec226d897d9e92e0b8",
 		 "patches": ["hostap-0001-build-Implement-GNOME-Build-API-for-wpa_supplicant.patch",
 		             "hostap-0001-Add-config-file.patch",
-			     "hostap-0001-build-Use-libnl-3.0-pkg-config-file.patch"]},
+			     "hostap-0001-build-Use-libnl-3.0-pkg-config-file.patch",
+			     "hostap-supplicant-Install-systemd-units-if-configured-to-do.patch"]},
 
 		{"src": "fd-NM:NetworkManager",
 		 "config-opts": ["--with-distro=generic",
diff --git a/patches/hostap-supplicant-Install-systemd-units-if-configured-to-do.patch b/patches/hostap-supplicant-Install-systemd-units-if-configured-to-do.patch
new file mode 100644
index 0000000..c456e6c
--- /dev/null
+++ b/patches/hostap-supplicant-Install-systemd-units-if-configured-to-do.patch
@@ -0,0 +1,50 @@
+From 2d59c3f0cef7891d80c48a2404bfb35c0a61fe39 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Sun, 16 Sep 2012 12:24:06 -0400
+Subject: [PATCH] supplicant: Install systemd units if configured to do so
+
+---
+ wpa_supplicant/.config  |  1 +
+ wpa_supplicant/Makefile | 14 ++++++++++++++
+ 2 files changed, 15 insertions(+)
+
+diff --git a/wpa_supplicant/.config b/wpa_supplicant/.config
+index 1c2f527..3d7f538 100644
+--- a/wpa_supplicant/.config
++++ b/wpa_supplicant/.config
+@@ -2,6 +2,7 @@ CONFIG_CTRL_IFACE=y
+ CONFIG_CTRL_IFACE_DBUS=y
+ CONFIG_CTRL_IFACE_DBUS_NEW=y
+ CONFIG_CTRL_IFACE_DBUS_INTRO=y
++CONFIG_SYSTEMD=y
+ CONFIG_DRIVER_WEXT=y
+ CONFIG_LIBNL32=y
+ CONFIG_DRIVER_NL80211=y
+diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
+index 540909e..da826b4 100644
+--- a/wpa_supplicant/Makefile
++++ b/wpa_supplicant/Makefile
+@@ -1236,6 +1236,20 @@ DBUS_CFLAGS += -DCONFIG_DBUS
+ DBUS_OBJS += dbus/dbus_common.o
+ endif
+ 
++ifdef CONFIG_SYSTEMD
++SYSTEMD_SYSTEM_UNITDIR = $(shell $(PKG_CONFIG) --variable=systemdsystemunitdir systemd)
++SYSTEMD_SYSTEM_UNITS = \
++	systemd/wpa_supplicant.service \
++	systemd/wpa_supplicant  service \
++	systemd/wpa_supplicant-nl80211  service \
++	systemd/wpa_supplicant-wired  service
++
++install-data::
++	for sv in $(SYSTEMD_SYSTEM_UNITS); do \
++	  install -D $${sv} $(DESTDIR)$(SYSTEMD_SYSTEM_UNITDIR)/$${sv}; \
++	done
++endif
++
+ OBJS += $(DBUS_OBJS)
+ CFLAGS += $(DBUS_CFLAGS)
+ LIBS += $(DBUS_LIBS)
+-- 
+1.7.11.4
+