[oe-commits] Mihai Prica : wpa-supplicant: configured to work with libnl 3.2.14

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: e328400ec02300be1ce3c8a9f63d8b30f9fe2136
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e328400ec02300be1ce3c8a9f63d8b30f9fe2136

Author: Mihai Prica <mihai.prica at intel.com>
Date:   Tue Dec  4 18:50:30 2012 +0200

wpa-supplicant: configured to work with libnl 3.2.14

* Updated the configuration file for libnl-3
* Added python include dir path to configuration file

Signed-off-by: Mihai Prica <mihai.prica at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 .../wpa-supplicant/wpa-supplicant-1.0.inc          |    1 +
 .../wpa-supplicant-1.0/defconfig-gnutls            |    2 +-
 .../wpa-supplicant/wpa-supplicant_1.0.bb           |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc
index 485a2dd..ff5cddc 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc
@@ -25,6 +25,7 @@ FILES_${PN} += "${datadir}/dbus-1/system-services/*"
 CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf"
 
 do_configure () {
+	echo "CFLAGS +=\"-I${STAGING_INCDIR}/libnl3\"" >> ${WORKDIR}/defconfig-gnutls
 	install -m 0755 ${WORKDIR}/defconfig-gnutls .config
 }
 
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/defconfig-gnutls b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/defconfig-gnutls
index e03338f..e041b4d 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/defconfig-gnutls
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0/defconfig-gnutls
@@ -81,7 +81,7 @@ CONFIG_DRIVER_HOSTAP=y
 CONFIG_DRIVER_WEXT=y
 
 # Driver interface for Linux drivers using the nl80211 kernel interface
-CONFIG_LIBNL20=y
+CONFIG_LIBNL32=y
 CONFIG_DRIVER_NL80211=y
 
 # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb
index 36ee25c..1150075 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb
@@ -1,6 +1,6 @@
 require wpa-supplicant-1.0.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI[md5sum] = "8650f6aa23646ef634402552d0669640"
 SRC_URI[sha256sum] = "91d41d473a5aafa2e25dd6577ebda975c4d4a3188850a53e31feaf7c04482b9c"