upgrade acx and acx-mac80211, removed two patches now unneeded

[openwrt.git] / package / wpa_supplicant / Makefile

diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile
index 0530a95..a901968 100644 (file)
--- a/package/wpa_supplicant/Makefile
+++ b/package/wpa_supplicant/Makefile
@@ -9,16 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wpa_supplicant
-PKG_VERSION:=0.5.5
+PKG_VERSION:=0.5.7
 PKG_RELEASE:=1
-PKG_MD5SUM:=482dd85949c82aa15309e5ab3d2cf5c3
+PKG_MD5SUM:=bd2436392ad3c6d2513da701a12f2d27
 
 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -31,7 +27,6 @@ define Package/wpa-supplicant
   URL:=http://hostap.epitest.fi/wpa_supplicant/
 endef
 
-
 define Package/wpa-cli
   SECTION:=net
   CATEGORY:=Network
@@ -40,6 +35,13 @@ define Package/wpa-cli
   DESCRIPTION:=
 endef
 
+define Package/wpa-passphrase
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=wpa-supplicant
+  TITLE:=Set WPA passphrase for a SSID
+  DESCRIPTION:=
+endef
 
 define Build/Configure
        cp ./files/config.$(ARCH) $(PKG_BUILD_DIR)/.config
@@ -51,8 +53,8 @@ define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CC)" \
                KERNEL=$(LINUX_DIR) \
-               CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-               LDFLAGS=" -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+               CPPFLAGS="$(TARGET_CPPFLAGS)" \
+               LDFLAGS="$(TARGET_LDFLAGS)" \
                all
        $(STRIP) $(PKG_BUILD_DIR)/wpa_supplicant
        $(STRIP) $(PKG_BUILD_DIR)/wpa_cli
@@ -69,5 +71,11 @@ define Package/wpa-cli/install
        $(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-passphrase))