From a7e3f3276ae56158402e854154a0784319f193f1 Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan@buglabs.net>
Date: Thu, 3 Feb 2011 10:34:55 +0100
Subject: wpa-supplicant-0.7: Enable the nl80211 driver

Also enable support for libnl2 and depend on it.
---
 recipes/wpa-supplicant/wpa-supplicant-0.7.3/defconfig-gnutls | 3 ++-
 recipes/wpa-supplicant/wpa-supplicant-0.7.inc                | 7 ++++++-
 recipes/wpa-supplicant/wpa-supplicant_0.7.3.bb               | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/recipes/wpa-supplicant/wpa-supplicant-0.7.3/defconfig-gnutls b/recipes/wpa-supplicant/wpa-supplicant-0.7.3/defconfig-gnutls
index cc6b0ce0bf..33ee9ea8d8 100644
--- a/recipes/wpa-supplicant/wpa-supplicant-0.7.3/defconfig-gnutls
+++ b/recipes/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_DRIVER_NL80211=y
+CONFIG_LIBNL20=y
 
 # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
 #CONFIG_DRIVER_BSD=y
diff --git a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc b/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
index 666ba999f5..6ee17cf5b7 100644
--- a/recipes/wpa-supplicant/wpa-supplicant-0.7.inc
+++ b/recipes/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 libnl2"
 RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
 
 SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
@@ -19,6 +19,11 @@ SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
 
 S = "${WORKDIR}/wpa_supplicant-${PV}/wpa_supplicant"
 
+# We stage libnl2 header files not directly as they clash with libnl files. Once
+# we only use libnl2 and stage the headers at the normal place we can remove
+# this.
+CFLAGS += "-I${STAGING_INCDIR}/libnl2/"
+
 PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli "
 FILES_wpa-supplicant-passphrase = "/usr/sbin/wpa_passphrase"
 FILES_wpa-supplicant-cli = "/usr/sbin/wpa_cli"
diff --git a/recipes/wpa-supplicant/wpa-supplicant_0.7.3.bb b/recipes/wpa-supplicant/wpa-supplicant_0.7.3.bb
index 87baf336d8..03bd937890 100644
--- a/recipes/wpa-supplicant/wpa-supplicant_0.7.3.bb
+++ b/recipes/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