summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2010-01-19 15:07:54 -0300
committerPeter Korsgaard <jacmet@sunsite.dk>2010-01-20 11:08:14 +0100
commitca2ad7d855d04df2036f5685cebb010bfe2c19a9 (patch)
tree4eb5d210e2bf3e0f71be4e3fbea52ecc04a226af
parentc95e3b848141e90b26324e9a7c117e746d702ec7 (diff)
Bump wpa_supplicant to 0.6.10, enable nl80211
Closes #925. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES3
-rw-r--r--package/wpa_supplicant/wpa_supplicant.mk10
2 files changed, 10 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index 32c9f8e89..db9760410 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,7 +8,7 @@
directfb, e2fsprogs, gstreamer, gst-plugins-bad, hal, iptables,
iw, jpeg, libfuse, libpcap, libungif, lighttpd, mesa, mpg123,
mtd-utils, neon, pcre, qt, rpm, sshfs, tremor, u-boot,
- usb_modeswitch, usbutils, xfsprogs
+ usb_modeswitch, usbutils, wpa_supplicant, xfsprogs
Issues resolved (http://bugs.uclibc.org):
@@ -33,6 +33,7 @@
#841: Build error
#913: Bump iptables to 1.4.6
#919: Bump usb_modeswitch package to 1.0.7
+ #925: Bump wpa_supplicant package to 0.6.10
2009.11, Released December 1st, 2009:
diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index 7edab8484..01436b189 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -4,8 +4,7 @@
#
#############################################################
-WPA_SUPPLICANT_VERSION = 0.6.9
-WPA_SUPPLICANT_SOURCE = wpa_supplicant-$(WPA_SUPPLICANT_VERSION).tar.gz
+WPA_SUPPLICANT_VERSION = 0.6.10
WPA_SUPPLICANT_SITE = http://hostap.epitest.fi/releases
WPA_SUPPLICANT_LIBTOOL_PATCH = NO
WPA_SUPPLICANT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
@@ -15,6 +14,10 @@ WPA_SUPPLICANT_SUBDIR = wpa_supplicant
WPA_SUPPLICANT_TARGET_BINS = wpa_cli wpa_supplicant wpa_passphrase
WPA_SUPPLICANT_DBUS_SERVICE = fi.epitest.hostap.WPASupplicant
+ifeq ($(BR2_PACKAGE_LIBNL),y)
+ WPA_SUPPLICANT_DEPENDENCIES += libnl
+endif
+
ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_OPENSSL),y)
WPA_SUPPLICANT_DEPENDENCIES += openssl
endif
@@ -46,6 +49,9 @@ endif
ifeq ($(BR2_PACKAGE_DBUS),y)
echo "CONFIG_CTRL_IFACE_DBUS=y" >>$(WPA_SUPPLICANT_CONFIG)
endif
+ifeq ($(BR2_PACKAGE_LIBNL),y)
+ echo "CONFIG_DRIVER_NL80211=y" >>$(WPA_SUPPLICANT_CONFIG)
+endif
touch $@
$(WPA_SUPPLICANT_HOOK_POST_INSTALL):