[wpa_supplicant] Fix menuconfig

[openwrt/svn-archive/archive.git] / package / wpa_supplicant / Makefile

diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile
index 3a905b2c9310b448bc0e2d6c5252194910a10f61..1171ba00d3bf56ae6bfc31f0fa96e57429655d9d 100644 (file)
--- a/package/wpa_supplicant/Makefile
+++ b/package/wpa_supplicant/Makefile
@@ -9,19 +9,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wpa_supplicant
-PKG_VERSION:=0.5.10
+PKG_VERSION:=0.6.3
 PKG_RELEASE:=1
-PKG_MD5SUM:=9e7b99da67c47d81121368c6d580d069
+PKG_MD5SUM:=b51b2975f21006f85f7297f3fb1acde1
 
 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 include $(INCLUDE_DIR)/package.mk
+STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_kmod-madwifi CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK)
 
 define Package/wpa-supplicant
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libopenssl
   TITLE:=WPA Supplicant
   URL:=http://hostap.epitest.fi/wpa_supplicant/
 endef
@@ -30,6 +30,11 @@ define Package/wpa-supplicant/Description
  WPA Supplicant
 endef
 
+define Package/wpa-supplicant/config
+       source "$(SOURCE)/Config.in"
+endef
+
+
 define Package/wpa-cli
   SECTION:=net
   CATEGORY:=Network
@@ -38,30 +43,35 @@ define Package/wpa-cli
 endef
 
 define Package/wpa-cli/Description
- 
+ WPA Supplicant control utility 
 endef
 
+CONFIG=$(firstword $(wildcard ./files/config.$(BOARD) ./files/config.$(ARCH) ./config))
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/madwifi $(if $(CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK),-DNO_TIMESTAMP_CHECK)
+
 define Build/Configure
-       cp ./files/config.$(ARCH) $(PKG_BUILD_DIR)/.config
+       cp $(CONFIG) $(PKG_BUILD_DIR)/wpa_supplicant/.config
+       $(if $(CONFIG_PACKAGE_kmod-madwifi),,$(SED) 's,^CONFIG_DRIVER_MADWIFI,#CONFIG_DRIVER_MADWIFI,g' $(PKG_BUILD_DIR)/wpa_supplicant/.config)
 endef
 
 define Build/Compile
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR) \
+       CFLAGS="$(TARGET_CFLAGS)" \
+       $(MAKE) -C $(PKG_BUILD_DIR)/wpa_supplicant \
                CC="$(TARGET_CC)" \
                KERNEL=$(LINUX_DIR) \
                CPPFLAGS="$(TARGET_CPPFLAGS)" \
                LDFLAGS="$(TARGET_LDFLAGS)" \
                all
-       $(STRIP) $(PKG_BUILD_DIR)/wpa_supplicant
-       $(STRIP) $(PKG_BUILD_DIR)/wpa_cli
-               
 endef
 
 define Package/wpa-supplicant/install
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_BUILD_DIR)/wpa_{supplicant,passphrase} $(1)/usr/sbin/
+       $(CP) \
+               $(PKG_BUILD_DIR)/wpa_supplicant/wpa_supplicant \
+               $(PKG_BUILD_DIR)/wpa_supplicant/wpa_passphrase \
+               $(1)/usr/sbin/
 endef
 
 define Package/wpa-cli/install