[AR7] more 2.6.24 patches

[openwrt.git] / package / wpa_supplicant / Makefile

diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile
index b3fec0c..a178e77 100644 (file)
--- a/package/wpa_supplicant/Makefile
+++ b/package/wpa_supplicant/Makefile
@@ -9,16 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wpa_supplicant
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wpa_supplicant

-PKG_VERSION:=0.5.5
+PKG_VERSION:=0.5.9

 PKG_RELEASE:=1
 PKG_RELEASE:=1

-PKG_MD5SUM:=482dd85949c82aa15309e5ab3d2cf5c3
+PKG_MD5SUM:=390e46066fa96ef9ba8e2dd63fca5aa0

 
 

-PKG_SOURCE_URL:=http://hostap.epitest.fi/releases
+PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 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
 
 
 include $(INCLUDE_DIR)/package.mk
 


@@ -27,19 +23,23 @@ 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-cli/Description
+ 
+endef

 
 define Build/Configure
        cp ./files/config.$(ARCH) $(PKG_BUILD_DIR)/.config
 
 define Build/Configure
        cp ./files/config.$(ARCH) $(PKG_BUILD_DIR)/.config


@@ -51,8 +51,8 @@ define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CC)" \
                KERNEL=$(LINUX_DIR) \
        $(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
                all
        $(STRIP) $(PKG_BUILD_DIR)/wpa_supplicant
        $(STRIP) $(PKG_BUILD_DIR)/wpa_cli


@@ -60,12 +60,12 @@ define Build/Compile
 endef
 
 define Package/wpa-supplicant/install
 endef
 
 define Package/wpa-supplicant/install

-       install -m0755 -d $(1)/usr/sbin
-       $(CP) $(PKG_BUILD_DIR)/wpa_supplicant $(1)/usr/sbin/
+       $(INSTALL_DIR) $(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

-       install -m0755 -d $(1)/usr/sbin
+       $(INSTALL_DIR) $(1)/usr/sbin

        $(CP) $(PKG_BUILD_DIR)/wpa_cli $(1)/usr/sbin/
 endef
 
        $(CP) $(PKG_BUILD_DIR)/wpa_cli $(1)/usr/sbin/
 endef