use qstrip macro to strip quoted CONFIG_* strings

[openwrt.git] / package / wpa_supplicant / Makefile

diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile
index a901968..361a486 100644 (file)
--- a/package/wpa_supplicant/Makefile
+++ b/package/wpa_supplicant/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2008 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -9,9 +9,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wpa_supplicant
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wpa_supplicant

-PKG_VERSION:=0.5.7
+PKG_VERSION:=0.5.10

 PKG_RELEASE:=1
 PKG_RELEASE:=1

-PKG_MD5SUM:=bd2436392ad3c6d2513da701a12f2d27
+PKG_MD5SUM:=9e7b99da67c47d81121368c6d580d069

 
 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz


@@ -23,24 +23,22 @@ define Package/wpa-supplicant
   CATEGORY:=Network
   DEPENDS:=+libopenssl
   TITLE:=WPA Supplicant
   CATEGORY:=Network
   DEPENDS:=+libopenssl
   TITLE:=WPA Supplicant

-  DESCRIPTION:=WPA Supplicant

   URL:=http://hostap.epitest.fi/wpa_supplicant/
 endef
 
   URL:=http://hostap.epitest.fi/wpa_supplicant/
 endef
 

+define Package/wpa-supplicant/Description
+ WPA Supplicant
+endef
+

 define Package/wpa-cli
   SECTION:=net
   CATEGORY:=Network
   DEPENDS:=wpa-supplicant
   TITLE:=WPA Supplicant command line interface
 define Package/wpa-cli
   SECTION:=net
   CATEGORY:=Network
   DEPENDS:=wpa-supplicant
   TITLE:=WPA Supplicant command line interface

-  DESCRIPTION:=

 endef
 
 endef
 

-define Package/wpa-passphrase
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=wpa-supplicant
-  TITLE:=Set WPA passphrase for a SSID
-  DESCRIPTION:=
+define Package/wpa-cli/Description
+ 

 endef
 
 define Build/Configure
 endef
 
 define Build/Configure


@@ -50,6 +48,7 @@ endef
 define Build/Compile
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
 define Build/Compile
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)

+       CFLAGS="$(TARGET_CFLAGS)" \

        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CC)" \
                KERNEL=$(LINUX_DIR) \
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CC)" \
                KERNEL=$(LINUX_DIR) \


@@ -63,7 +62,7 @@ endef
 
 define Package/wpa-supplicant/install
        $(INSTALL_DIR) $(1)/usr/sbin
 
 define Package/wpa-supplicant/install
        $(INSTALL_DIR) $(1)/usr/sbin

-       $(CP) $(PKG_BUILD_DIR)/wpa_supplicant $(1)/usr/sbin/
+       $(CP) $(PKG_BUILD_DIR)/wpa_{supplicant,passphrase} $(1)/usr/sbin/

 endef
 
 define Package/wpa-cli/install
 endef
 
 define Package/wpa-cli/install


@@ -71,11 +70,5 @@ define Package/wpa-cli/install
        $(CP) $(PKG_BUILD_DIR)/wpa_cli $(1)/usr/sbin/
 endef
 
        $(CP) $(PKG_BUILD_DIR)/wpa_cli $(1)/usr/sbin/
 endef
 

-define Package/wpa-passphrase/install
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/wpa_passphrase $(1)/usr/sbin/
-endef
-

 $(eval $(call BuildPackage,wpa-supplicant))
 $(eval $(call BuildPackage,wpa-cli))
 $(eval $(call BuildPackage,wpa-supplicant))
 $(eval $(call BuildPackage,wpa-cli))

-$(eval $(call BuildPackage,wpa-passphrase))