X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/68f4a7a320968009c0c97ab7d685b09064af7e05..305cc5a4528347d1f325ebdec6aba0d1a7687503:/package/hostapd/Makefile

diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index 1af252320..7e0f0877f 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -1,21 +1,66 @@
+# 
+# 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:=hostapd
-PKG_VERSION:=0.5.3
+PKG_VERSION:=0.5.7
 PKG_RELEASE:=1
-PKG_MD5SUM:=4e3134e8b0d86e831230f8c620fd81bb
-PKG_BUILDDEP:=madwifi openssl
 
-PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
+PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
+PKG_MD5SUM:=d5113247dc6ee17106e6bc7cb89aa507
+
+PKG_BUILD_DEPENDS:=madwifi
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/hostapd/Default
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=IEEE 802.1x Authenticator
+  URL:=http://hostap.epitest.fi/
+endef
+
+define Package/hostapd
+  $(call Package/hostapd/Default)
+  DEPENDS:=+libopenssl @!LINUX_2_6_AVR32
+  TITLE+= (full)
+  DESCRIPTION:=\
+	This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS \\\
+	Authenticator.
+endef
+
+define Package/hostapd/conffiles
+/etc/hostapd.conf
+endef
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+define Package/hostapd-mini
+  $(call Package/hostapd/Default)
+  DEPENDS:=@!LINUX_2_6_AVR32
+  TITLE+= (WPA-PSK only)
+  DESCRIPTION:=\
+	This package contains a minimal IEEE 802.1x/WPA/EAP/RADIUS Authenticator \\\
+	(WPA-PSK only).
+endef
 
-include $(TOPDIR)/package/rules.mk
+define Package/hostapd-mini/conffiles
+/etc/hostapd.conf
+endef
 
+define Package/hostapd-utils
+  $(call Package/hostapd/Default)
+  DEPENDS:=@PACKAGE_hostapd||PACKAGE_hostapd-mini
+  TITLE+= (utils)
+  DESCRIPTION:=\
+	This package contains a command line utility to control the \\\
+	IEEE 802.1x/WPA/EAP/RADIUS Authenticator.
+endef
 
 define Build/ConfigureTarget
 	$(CP) $(PKG_BUILD_DIR) $(PKG_BUILD_DIR)_$(1)
@@ -26,8 +71,8 @@ define Build/CompileTarget
 	$(MAKE) -C $(PKG_BUILD_DIR)_$(1) \
 		$(TARGET_CONFIGURE_OPTS) \
 		OPTFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/madwifi" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/madwifi" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
 		hostapd hostapd_cli
 	$(CP) $(PKG_BUILD_DIR)_$(1)/hostapd_cli $(PKG_BUILD_DIR)/
 endef
@@ -37,10 +82,12 @@ define Package/InstallTemplate
 		rm -f $(PKG_BUILD_DIR)/.built; \
 		$(MAKE) $(PKG_BUILD_DIR)/.built; \
 	fi
-	install -m0755 -d $$(1)/etc
-	install -m0600 $(PKG_BUILD_DIR)_$(2)/madwifi.conf $$(1)/etc/hostapd.conf
-	install -m0755 -d $$(1)/usr/sbin
-	install -m0755 $(PKG_BUILD_DIR)_$(2)/hostapd $$(1)/usr/sbin/
+	$(INSTALL_DIR) $$(1)/lib/wifi
+	$(INSTALL_DATA) ./files/hostapd.sh $$(1)/lib/wifi/hostapd.sh
+	$(INSTALL_DIR) $$(1)/etc
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)_$(2)/madwifi.conf $$(1)/etc/hostapd.conf
+	$(INSTALL_DIR) $$(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)_$(2)/hostapd $$(1)/usr/sbin/
 endef
 
 define Package/Template
@@ -51,11 +98,10 @@ define Package/Template
   define Build/Compile/$(2)
 	$(call Build/CompileTarget,$(2))
   endef
- endif
-
- define Package/$(1)/install
+  define Package/$(1)/install
 	$(call Package/InstallTemplate,$(1),$(2))
- endef
+  endef
+ endif
 endef
 
 define Build/Configure
@@ -73,39 +119,14 @@ define Build/Clean
 	rm -rf $(PKG_BUILD_DIR)_mini
 endef
 
-define Package/hostapd
-SECTION:=net
-CATEGORY:=Network
-DEPENDS:=+libopenssl
-TITLE:=IEEE 802.1x Authenticator
-DESCRIPTION:=IEEE 802.1x/WPA/EAP/RADIUS Authenticator
-URL:=http://hostap.epitest.fi/
-endef
-
-define Package/hostapd-mini
-$(call Package/hostapd)
-TITLE:=IEEE 802.1x Authenticator (WPA-PSK only)
-DEPENDS:=
-DESCRIPTION:=IEEE 802.1x/WPA/EAP/RADIUS Authenticator (WPA-PSK only)
-endef
-
-define Package/hostapd-utils
-$(call Package/hostapd)
-DEPENDS:=@PACKAGE_hostapd||PACKAGE_hostapd-mini
-TITLE:=IEEE 802.1x Authenticator (utils)
-DESCRIPTION:=IEEE 802.1x/WPA/EAP/RADIUS Authenticator (command line utils)
-endef
-
 define Package/hostapd-utils/install
-	install -m0755 -d $(1)/usr/sbin
-	install -m0755 $(PKG_BUILD_DIR)/hostapd_cli $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd_cli $(1)/usr/sbin/
 endef
 
-
 $(eval $(call Package/Template,hostapd,default))
 $(eval $(call Package/Template,hostapd-mini,mini))
 
 $(eval $(call BuildPackage,hostapd))
 $(eval $(call BuildPackage,hostapd-mini))
 $(eval $(call BuildPackage,hostapd-utils))
-