From 44e17ea034bec68d4fff6b2cd4758bad3ab7ed09 Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Fri, 11 Feb 2011 17:03:55 +0800 Subject: wpa-supplicant: change dbus interface The new interface "fi.w1.wpa_supplicant1" is used in latest connman, thus add it in the wpa_supplicant default configuration. Besides, enable netlink support with libnl 2.0 mode. [BUGID #603] Signed-off-by: Dongxiao Xu --- .../wpa-supplicant/wpa-supplicant-0.7.3/defconfig-gnutls | 4 +++- meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc | 2 +- meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defconfig-gnutls b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defconfig-gnutls index e325bb83e9..c679e00288 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defconfig-gnutls +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defconfig-gnutls @@ -81,7 +81,8 @@ CONFIG_DRIVER_HOSTAP=y CONFIG_DRIVER_WEXT=y # Driver interface for Linux drivers using the nl80211 kernel interface -#CONFIG_DRIVER_NL80211=y +CONFIG_LIBNL20=y +CONFIG_DRIVER_NL80211=y # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) #CONFIG_DRIVER_BSD=y @@ -405,3 +406,4 @@ CONFIG_PEERKEY=y CONFIG_TLS = gnutls CONFIG_GNUTLS_EXTRA=y CONFIG_CTRL_IFACE_DBUS=y +CONFIG_CTRL_IFACE_DBUS_NEW=y diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc index 7865b8fdc7..cd62d8f7e9 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc @@ -6,7 +6,7 @@ LICENSE = "GPLv2 | BSD" LIC_FILES_CHKSUM = "file://../COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ file://../README;md5=54cfc88015d3ce83f7156e63c6bb1738 \ file://wpa_supplicant.c;beginline=1;endline=17;md5=acdc5a4b0d6345f21f136eace747260e" -DEPENDS = "gnutls dbus" +DEPENDS = "gnutls dbus libnl" RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli" SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb index 87baf336d8..03bd937890 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb @@ -1,6 +1,6 @@ require wpa-supplicant-0.7.inc -PR = "r3" +PR = "r4" SRC_URI[md5sum] = "f516f191384a9a546e3f5145c08addda" SRC_URI[sha256sum] = "d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443" -- cgit 1.2.3-korg