wpa-supplicant: enable the DBus control interface (for NM)

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2788 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 8 insertions, 1 deletions

diff --git a/meta/packages/wpa-supplicant/files/defconfig-gnutls b/meta/packages/wpa-supplicant/files/defconfig-gnutls
index 2df5e51df8..5b4ff0d03e 100644
--- a/meta/packages/wpa-supplicant/files/defconfig-gnutls
+++ b/meta/packages/wpa-supplicant/files/defconfig-gnutls
@@ -174,3 +174,5 @@ CONFIG_TLS=gnutls
 # apply for distribution of the resulting binary.
 CONFIG_GNUTLS_EXTRA=y
 
+# Add support for DBus control interface
+CONFIG_CTRL_IFACE_DBUS=y
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant-0.5.inc b/meta/packages/wpa-supplicant/wpa-supplicant-0.5.inc
index 96bbfaeeb0..10b7690171 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant-0.5.inc
+++ b/meta/packages/wpa-supplicant/wpa-supplicant-0.5.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)."
 SECTION = "network"
 LICENSE = "GPL"
 HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
-DEPENDS = "gnutls"
+DEPENDS = "gnutls dbus"
 
 SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
         file://defconfig-gnutls \
@@ -57,4 +57,7 @@ do_install () {
         install -m 755 ${WORKDIR}/wpa-supplicant.sh ${D}${sysconfdir}/network/if-pre-up.d/wpa-supplicant
         cd ${D}${sysconfdir}/network/ && \
         ln -sf ../if-pre-up.d/wpa-supplicant if-post-down.d/wpa-supplicant
+
+        install -d ${D}/${sysconfdir}/dbus-1/system.d
+        install -m 644 ${S}/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d
 }
diff --git a/meta/packages/wpa-supplicant/wpa-supplicant_0.5.8.bb b/meta/packages/wpa-supplicant/wpa-supplicant_0.5.8.bb
index 6594bbfdbe..67a5b99b0f 100644
--- a/meta/packages/wpa-supplicant/wpa-supplicant_0.5.8.bb
+++ b/meta/packages/wpa-supplicant/wpa-supplicant_0.5.8.bb
@@ -1 +1,3 @@
 require wpa-supplicant-0.5.inc
+
+PR = "r1"