X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/840c30e693f906b4aa54578f948ec10c32b36536..7793ba8895011fd1b10f252cbab3df949c225913:/package/hostapd/Makefile

diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index f4a614521..55bef9bfd 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -1,46 +1,127 @@
-# $Id$
+#
+# Copyright (C) 2006-2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostapd
-PKG_VERSION:=0.5.3
+PKG_VERSION:=0.6.9
 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_SOURCE_SUBDIR:=hostapd-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_MD5SUM:=83630d11fa66ade9091f1b304fccd74c
+
+PKG_BUILD_DEPENDS:= \
+	PACKAGE_kmod-madwifi:madwifi \
+	PACKAGE_kmod-mac80211:mac80211 \
+
+PKG_CONFIG_DEPENDS:= \
+	CONFIG_PACKAGE_kmod-ath9k \
+	CONFIG_PACKAGE_kmod-mac80211 \
+	CONFIG_PACKAGE_kmod-madwifi \
+	CONFIG_PACKAGE_hostapd \
+	CONFIG_PACKAGE_hostapd-mini \
+
+include $(INCLUDE_DIR)/package.mk
+
+DRIVER_MAKEOPTS= \
+	CONFIG_DRIVER_NL80211=$(CONFIG_PACKAGE_kmod-mac80211) \
+	CONFIG_DRIVER_MADWIFI=$(CONFIG_PACKAGE_kmod-madwifi) \
+	CONFIG_IEEE80211N=$(CONFIG_PACKAGE_kmod-ath9k)
+
+define Package/hostapd/Default
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=IEEE 802.1x Authenticator
+  URL:=http://hostap.epitest.fi/
+  DEPENDS:=@!TARGET_avr32 @!TARGET_etrax +PACKAGE_kmod-mac80211:libnl-tiny
+endef
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+define Package/hostapd
+$(call Package/hostapd/Default)
+  TITLE+= (full)
+  DEPENDS+= +PACKAGE_hostapd:libopenssl
+endef
 
-include $(TOPDIR)/package/rules.mk
+#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/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/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
+	rm -rf $(PKG_BUILD_DIR)/hostapd.$(1)
+	mkdir -p $(PKG_BUILD_DIR)/hostapd.$(1)
+	$(CP) \
+		$(PKG_BUILD_DIR)/hostapd \
+		$(PKG_BUILD_DIR)/src \
+		$(PKG_BUILD_DIR)/hostapd.$(1)/
+	$(CP) ./files/$(1).config $(PKG_BUILD_DIR)/hostapd.$(1)/hostapd/.config
 endef
 
+TARGET_CPPFLAGS := \
+	-I$(STAGING_DIR)/usr/include/libnl-tiny \
+	-I$(PKG_BUILD_DIR)/src/crypto \
+	$(TARGET_CPPFLAGS) \
+	-I$(STAGING_DIR)/usr/include/madwifi \
+	-I$(STAGING_DIR)/usr/include/mac80211 \
+	-DCONFIG_LIBNL20 \
+	-D_GNU_SOURCE
+
 define Build/CompileTarget
-	$(MAKE) -C $(PKG_BUILD_DIR)_$(1) \
+	CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
+	$(MAKE) -C $(PKG_BUILD_DIR)/hostapd.$(1)/hostapd \
 		$(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" \
+		$(DRIVER_MAKEOPTS) \
+		LIBS="$(TARGET_LDFLAGS) \
+			$(if $(CONFIG_PACKAGE_kmod-mac80211),-lm -lnl-tiny) \
+			$(if $(findstring default,$(1)),-lssl -lcrypto)" \
 		hostapd hostapd_cli
-	$(CP) $(PKG_BUILD_DIR)_$(1)/hostapd_cli $(PKG_BUILD_DIR)/
+	$(CP) $(PKG_BUILD_DIR)/hostapd.$(1)/hostapd/hostapd_cli $(PKG_BUILD_DIR)/
 endef
 
 define Package/InstallTemplate
-	if [ \! -f "$(PKG_BUILD_DIR)_$(2)/hostapd" ]; then \
-		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)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd.$(2)/hostapd/hostapd $$(1)/usr/sbin/
+# config is managed through uci
+#	$(INSTALL_DIR) $$(1)/etc
+#	$(INSTALL_CONF) $(PKG_BUILD_DIR)/hostapd.$(2)/hostapd/hostapd.conf $$(1)/etc/hostapd.conf
 endef
 
 define Package/Template
@@ -51,14 +132,14 @@ 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
+	rm -f $(PKG_BUILD_DIR)/.configured*
 	$(call Build/Configure/default)
 	$(call Build/Configure/mini)
 endef
@@ -73,39 +154,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))
-