[oe-commits] Stefan Schmidt : wpa-supplicant: Prepare >=0.6 for dbus system activation

[GIT User account]

Module: openembedded.git
Branch: fso/milestone5.5
Commit: 638dc47abc7157500630cccefe10521378771364
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=638dc47abc7157500630cccefe10521378771364

Author: Stefan Schmidt <stefan at datenfreihafen.org>
Date:   Wed Mar 25 17:37:17 2009 +0100

wpa-supplicant: Prepare >=0.6 for dbus system activation

* Fix binary path in service file
* Install service under the right name taht it gets detected and used correctly
* Bump PR's

---

 .../files/service-activation-binary-path.patch     |   10 ++++++++++
 packages/wpa-supplicant/wpa-supplicant-0.6.inc     |    7 +++++--
 packages/wpa-supplicant/wpa-supplicant_0.6.0.bb    |    2 +-
 packages/wpa-supplicant/wpa-supplicant_0.6.3.bb    |    2 +-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/packages/wpa-supplicant/files/service-activation-binary-path.patch b/packages/wpa-supplicant/files/service-activation-binary-path.patch
new file mode 100644
index 0000000..c31d877
--- /dev/null
+++ b/packages/wpa-supplicant/files/service-activation-binary-path.patch
@@ -0,0 +1,10 @@
+Index: wpa_supplicant-0.6.3/wpa_supplicant/dbus-wpa_supplicant.service
+===================================================================
+--- wpa_supplicant-0.6.3.orig/wpa_supplicant/dbus-wpa_supplicant.service	2009-03-25 12:12:38.000000000 +0100
++++ wpa_supplicant-0.6.3/wpa_supplicant/dbus-wpa_supplicant.service	2009-03-25 12:12:47.000000000 +0100
+@@ -1,4 +1,4 @@
+ [D-BUS Service]
+ Name=fi.epitest.hostap.WPASupplicant
+-Exec=/sbin/wpa_supplicant -u
++Exec=/usr/sbin/wpa_supplicant -u
+ User=root
diff --git a/packages/wpa-supplicant/wpa-supplicant-0.6.inc b/packages/wpa-supplicant/wpa-supplicant-0.6.inc
index 779bee7..e67d75e 100644
--- a/packages/wpa-supplicant/wpa-supplicant-0.6.inc
+++ b/packages/wpa-supplicant/wpa-supplicant-0.6.inc
@@ -13,7 +13,9 @@ DEFAULT_PREFERENCE = "-2"
 SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
 	file://defconfig-0.6.0-gnutls \
 	file://ifupdown.sh \
-	file://functions.sh"
+	file://functions.sh \
+	file://service-activation-binary-path.patch;patch=1;pnum=2 \
+	"
 
 #	file://gnutlsfix.patch;patch=1 \
 
@@ -63,7 +65,8 @@ do_install () {
 	install -d ${D}/${sysconfdir}/dbus-1/system.d
 	install -m 644 ${S}/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d
 	install -d ${D}/${datadir}/dbus-1/system-services
-	install -m 644 ${S}/dbus-wpa_supplicant.service ${D}/${datadir}/dbus-1/system-services
+	install -m 644 ${S}/dbus-wpa_supplicant.service ${D}/${datadir}/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service
+
 
 	ln -s /etc/wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-pre-up.d/wpasupplicant
 	ln -s /etc/wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-post-down.d/wpasupplicant
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.6.0.bb b/packages/wpa-supplicant/wpa-supplicant_0.6.0.bb
index 11fc774..3b0e993 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.6.0.bb
+++ b/packages/wpa-supplicant/wpa-supplicant_0.6.0.bb
@@ -1,3 +1,3 @@
 require wpa-supplicant-0.6.inc
 
-PR = "r2"
+PR = "r3"
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.6.3.bb b/packages/wpa-supplicant/wpa-supplicant_0.6.3.bb
index 11fc774..3b0e993 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.6.3.bb
+++ b/packages/wpa-supplicant/wpa-supplicant_0.6.3.bb
@@ -1,3 +1,3 @@
 require wpa-supplicant-0.6.inc
 
-PR = "r2"
+PR = "r3"