X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/883b51c747468303806c7f80ff72134c49688b38..83128cefc802555408825618a03fe52fb4a82a87:/package/wpa_supplicant/Makefile

diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile
index b86034dcb..644814556 100644
--- a/package/wpa_supplicant/Makefile
+++ b/package/wpa_supplicant/Makefile
@@ -1,40 +1,69 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 # $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wpa_supplicant
-PKG_VERSION:=0.3.8
+PKG_VERSION:=0.5.7
 PKG_RELEASE:=1
-PKG_MD5SUM:=c9ced104f0322f834a84336c293b4b57
+PKG_MD5SUM:=bd2436392ad3c6d2513da701a12f2d27
 
-PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
+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)
+include $(INCLUDE_DIR)/package.mk
 
-include $(TOPDIR)/package/rules.mk
+define Package/wpa-supplicant
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libopenssl
+  TITLE:=WPA Supplicant
+  DESCRIPTION:=WPA Supplicant
+  URL:=http://hostap.epitest.fi/wpa_supplicant/
+endef
 
-$(eval $(call PKG_template,WPA_SUPPLICANT,wpa-supplicant,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured:
-	cp -fpR ./files/config $(PKG_BUILD_DIR)/.config
-	touch $@
+define Package/wpa-cli
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=wpa-supplicant
+  TITLE:=WPA Supplicant command line interface
+  DESCRIPTION:=
+endef
 
-$(PKG_BUILD_DIR)/.built:
+
+define Build/Configure
+	cp ./files/config.$(ARCH) $(PKG_BUILD_DIR)/.config
+endef
+
+define Build/Compile
+	rm -rf $(PKG_INSTALL_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		CPPFLAGS="-I$(TOPDIR)/package/openwrt/include -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
-		OPT_FLAGS="$(TARGET_CFLAGS)" \
+		CC="$(TARGET_CC)" \
 		KERNEL=$(LINUX_DIR) \
+		CPPFLAGS="$(TARGET_CPPFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
 		all
-	touch $@
-
-$(IPKG_WPA_SUPPLICANT):
-	install -m0755 -d $(IDIR_WPA_SUPPLICANT)/usr/sbin
-	install -m0755 $(PKG_BUILD_DIR)/wpa_cli $(IDIR_WPA_SUPPLICANT)/usr/sbin/
-	install -m0755 $(PKG_BUILD_DIR)/wpa_passphrase $(IDIR_WPA_SUPPLICANT)/usr/sbin/
-	install -m0755 $(PKG_BUILD_DIR)/wpa_supplicant $(IDIR_WPA_SUPPLICANT)/usr/sbin/
-	$(RSTRIP) $(IDIR_WPA_SUPPLICANT)
-	$(IPKG_BUILD) $(IDIR_WPA_SUPPLICANT) $(PACKAGE_DIR)
+	$(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 $(1)/usr/sbin/
+endef
+
+define Package/wpa-cli/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(PKG_BUILD_DIR)/wpa_cli $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,wpa-supplicant))
+$(eval $(call BuildPackage,wpa-cli))