X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c4b73fa154ce47702ee9b3bbe621d8f079eb7fa5..6a26e8186b1cc0e6e650f762a08475d944b1288d:/package/hostapd/Makefile

diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index 76376f528..55bef9bfd 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -1,116 +1,127 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2009 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.8
+PKG_VERSION:=0.6.9
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
-PKG_MD5SUM:=40416b48cae9c78e5a2452caf214aff3
+PKG_SOURCE_SUBDIR:=hostapd-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_MD5SUM:=83630d11fa66ade9091f1b304fccd74c
 
-PKG_BUILD_DEPENDS:=
+PKG_BUILD_DEPENDS:= \
+	PACKAGE_kmod-madwifi:madwifi \
+	PACKAGE_kmod-mac80211:mac80211 \
 
-ifeq ($(shell grep "CONFIG_PACKAGE_kmod-madwifi is not set" $(TOPDIR)/.config),)
-  PKG_BUILD_DEPENDS+=madwifi
-endif
-ifeq ($(shell grep "CONFIG_PACKAGE_kmod-mac80211 is not set" $(TOPDIR)/.config),)
-  PKG_BUILD_DEPENDS+=mac80211
-endif
+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
 
 define Package/hostapd
 $(call Package/hostapd/Default)
-  DEPENDS:=+libopenssl @!TARGET_AVR32 @!TARGET_ETRAX
   TITLE+= (full)
+  DEPENDS+= +PACKAGE_hostapd:libopenssl
 endef
 
-define Package/hostapd/conffiles
-/etc/hostapd.conf
-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 
+ This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS
  Authenticator.
 endef
 
 define Package/hostapd-mini
 $(call Package/hostapd/Default)
-  DEPENDS:=@!TARGET_AVR32 @!TARGET_ETRAX
   TITLE+= (WPA-PSK only)
 endef
 
-define Package/hostapd-mini/conffiles
-/etc/hostapd.conf
-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 
+ This package contains a minimal IEEE 802.1x/WPA/EAP/RADIUS Authenticator
  (WPA-PSK only).
 endef
 
 define Package/hostapd-utils
   $(call Package/hostapd/Default)
-  DEPENDS:=@PACKAGE_hostapd||PACKAGE_hostapd-mini
   TITLE+= (utils)
+  DEPENDS:=@PACKAGE_hostapd||PACKAGE_hostapd-mini
 endef
 
 define Package/hostapd-utils/description
- This package contains a command line utility to control the 
+ 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
-ifneq ($(CONFIG_PACKAGE_kmod-mac80211),)
-	echo "CONFIG_DRIVER_DEVICESCAPE=y" >> $(PKG_BUILD_DIR)_$(1)/.config
-endif
-endef
+	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="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/madwifi -I$(STAGING_DIR)/usr/include/mac80211" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
+		$(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_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/
+	$(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
@@ -128,6 +139,7 @@ define Package/Template
 endef
 
 define Build/Configure
+	rm -f $(PKG_BUILD_DIR)/.configured*
 	$(call Build/Configure/default)
 	$(call Build/Configure/mini)
 endef