X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ae98e0cfbcade9b099afc6f7bcbbaa1ed9d5448c..ebe4d354283f45ba15f83d080e8a93a46ee29a9e:/package/hostapd/Makefile?ds=sidebyside

diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index a1161e11f..85f42dc6a 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -9,61 +9,79 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostapd
-PKG_VERSION:=0.5.3
+PKG_VERSION:=0.5.8
 PKG_RELEASE:=1
-PKG_MD5SUM:=4e3134e8b0d86e831230f8c620fd81bb
-PKG_BUILDDEP:=madwifi
 
-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:=40416b48cae9c78e5a2452caf214aff3
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+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/
+  DEPENDS:=@!TARGET_avr32 @!TARGET_etrax
+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/
+$(call Package/hostapd/Default)
+  TITLE+= (full)
+  DEPENDS+= +libopenssl
 endef
 
 define Package/hostapd/conffiles
 /etc/hostapd.conf
 endef
 
+define Package/hostapd/description
+ This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS 
+ Authenticator.
+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)
+$(call Package/hostapd/Default)
+  TITLE+= (WPA-PSK only)
 endef
 
 define Package/hostapd-mini/conffiles
 /etc/hostapd.conf
 endef
 
+define Package/hostapd-mini/description
+ This package contains a minimal 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)
+  $(call Package/hostapd/Default)
+  TITLE+= (utils)
+  DEPENDS:=@PACKAGE_hostapd||PACKAGE_hostapd-mini
+endef
+
+define Package/hostapd-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)
 	$(CP) ./files/$(1).config $(PKG_BUILD_DIR)_$(1)/.config
+ifneq ($(CONFIG_PACKAGE_kmod-madwifi),)
+	echo "CONFIG_DRIVER_MADWIFI=y" >> $(PKG_BUILD_DIR)_$(1)/.config
+endif
 endef
 
 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
@@ -73,10 +91,16 @@ 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
+ifneq ($(CONFIG_PACKAGE_kmod-madwifi),)
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)_$(2)/madwifi.conf $$(1)/etc/hostapd.conf
+else
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)_$(2)/hostapd.conf $$(1)/etc/hostapd.conf
+endif
+	$(INSTALL_DIR) $$(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)_$(2)/hostapd $$(1)/usr/sbin/
 endef
 
 define Package/Template
@@ -109,8 +133,8 @@ define Build/Clean
 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))