projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
hostapd: upgrade to latest version
[openwrt.git] / package / hostapd / Makefile
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index 0c1d6fc..6b46796 100644 (file)
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -8,19 +8,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostapd
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostapd
-PKG_VERSION:=0.6.9
+PKG_VERSION:=20100108
 PKG_RELEASE:=1
 PKG_RELEASE:=1
+PKG_REV:=d97572a40fd7ec77094e2e4ef83424a4c0f7e24d
 
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=git://w1.fi/srv/git/hostap.git
 PKG_SOURCE_SUBDIR:=hostapd-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_SUBDIR:=hostapd-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_MD5SUM:=83630d11fa66ade9091f1b304fccd74c
+PKG_SOURCE_PROTO:=git
 
 PKG_BUILD_DEPENDS:= \
        PACKAGE_kmod-madwifi:madwifi \
        PACKAGE_kmod-mac80211:mac80211 \
 
 PKG_BUILD_DEPENDS:= \
        PACKAGE_kmod-madwifi:madwifi \
        PACKAGE_kmod-mac80211:mac80211 \
-       PACKAGE_kmod-mac80211:libnl \
 
 PKG_CONFIG_DEPENDS:= \
        CONFIG_PACKAGE_kmod-ath9k \
 
 PKG_CONFIG_DEPENDS:= \
        CONFIG_PACKAGE_kmod-ath9k \
@@ -28,12 +28,16 @@ PKG_CONFIG_DEPENDS:= \
        CONFIG_PACKAGE_kmod-madwifi \
        CONFIG_PACKAGE_hostapd \
        CONFIG_PACKAGE_hostapd-mini \
        CONFIG_PACKAGE_kmod-madwifi \
        CONFIG_PACKAGE_hostapd \
        CONFIG_PACKAGE_hostapd-mini \
+       CONFIG_PACKAGE_kmod-hostap
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
 DRIVER_MAKEOPTS= \
        CONFIG_DRIVER_NL80211=$(CONFIG_PACKAGE_kmod-mac80211) \
        CONFIG_DRIVER_MADWIFI=$(CONFIG_PACKAGE_kmod-madwifi) \
 
 include $(INCLUDE_DIR)/package.mk
 
 DRIVER_MAKEOPTS= \
        CONFIG_DRIVER_NL80211=$(CONFIG_PACKAGE_kmod-mac80211) \
        CONFIG_DRIVER_MADWIFI=$(CONFIG_PACKAGE_kmod-madwifi) \
+       CONFIG_DRIVER_HOSTAP=$(CONFIG_PACKAGE_kmod-hostap) \
        CONFIG_IEEE80211N=$(CONFIG_PACKAGE_kmod-ath9k)
 
 define Package/hostapd/Default
        CONFIG_IEEE80211N=$(CONFIG_PACKAGE_kmod-ath9k)
 
 define Package/hostapd/Default
@@ -41,19 +45,15 @@ define Package/hostapd/Default
   CATEGORY:=Network
   TITLE:=IEEE 802.1x Authenticator
   URL:=http://hostap.epitest.fi/
   CATEGORY:=Network
   TITLE:=IEEE 802.1x Authenticator
   URL:=http://hostap.epitest.fi/
-  DEPENDS:=@!TARGET_avr32 @!TARGET_etrax
+  DEPENDS:=@!TARGET_avr32 @!TARGET_etrax +PACKAGE_kmod-mac80211:libnl-tiny
 endef
 
 define Package/hostapd
 $(call Package/hostapd/Default)
   TITLE+= (full)
 endef
 
 define Package/hostapd
 $(call Package/hostapd/Default)
   TITLE+= (full)
-  DEPENDS+= +PACKAGE_hostapd:libopenssl
+  VARIANT:=full
 endef
 
 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.
 define Package/hostapd/description
  This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS
  Authenticator.
@@ -62,15 +62,11 @@ endef
 define Package/hostapd-mini
 $(call Package/hostapd/Default)
   TITLE+= (WPA-PSK only)
 define Package/hostapd-mini
 $(call Package/hostapd/Default)
   TITLE+= (WPA-PSK only)
+  VARIANT:=mini
 endef
 
 endef
 
-#define Package/hostapd-mini/conffiles
-#/etc/hostapd.conf
-#endef
-
 define Package/hostapd-mini/description
 define Package/hostapd-mini/description
- This package contains a minimal IEEE 802.1x/WPA/EAP/RADIUS Authenticator
- (WPA-PSK only).
+ This package contains a minimal IEEE 802.1x/WPA Authenticator (WPA-PSK only).
 endef
 
 define Package/hostapd-utils
 endef
 
 define Package/hostapd-utils
@@ -84,76 +80,59 @@ define Package/hostapd-utils/description
  IEEE 802.1x/WPA/EAP/RADIUS Authenticator.
 endef
 
  IEEE 802.1x/WPA/EAP/RADIUS Authenticator.
 endef
 
-define Build/ConfigureTarget
-       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
-
-define Build/CompileTarget
-       CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/madwifi -I$(STAGING_DIR)/usr/include/mac80211 -I$(STAGING_DIR)/usr/include/libnl $(TARGET_CPPFLAGS)" \
-       $(MAKE) -C $(PKG_BUILD_DIR)/hostapd.$(1)/hostapd \
-               $(TARGET_CONFIGURE_OPTS) \
-               $(DRIVER_MAKEOPTS) \
-               LIBS="$(TARGET_LDFLAGS) \
-                       $(if $(CONFIG_PACKAGE_kmod-mac80211),-lm $(STAGING_DIR)/usr/lib/libnl.a) \
-                       $(if $(findstring default,$(1)),-lssl -lcrypto)" \
-               hostapd hostapd_cli
-       $(CP) $(PKG_BUILD_DIR)/hostapd.$(1)/hostapd/hostapd_cli $(PKG_BUILD_DIR)/
-endef
-
-define Package/InstallTemplate
-       $(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
- ifneq ($(CONFIG_PACKAGE_$(1)),)
-  define Build/Configure/$(2)
-       $(call Build/ConfigureTarget,$(2))
-  endef
-  define Build/Compile/$(2)
-       $(call Build/CompileTarget,$(2))
-  endef
-  define Package/$(1)/install
-       $(call Package/InstallTemplate,$(1),$(2))
+ifneq ($(wildcard $(PKG_BUILD_DIR)/.config_*),$(subst .configured_,.config_,$(STAMP_CONFIGURED)))
+  $(warning $(wildcard $(PKG_BUILD_DIR)/.config_*) != $(subst .configured_,.config_,$(STAMP_CONFIGURED)))
+  define Build/Configure/rebuild
+       rm -f $(PKG_BUILD_DIR)/hostapd/hostapd
+       rm -f $(PKG_BUILD_DIR)/hostapd/*.o
+       rm -f $(PKG_BUILD_DIR)/src/drivers/drivers.o
+       rm -f $(PKG_BUILD_DIR)/.config_*
+       touch $(subst .configured_,.config_,$(STAMP_CONFIGURED))
   endef
   endef
- endif
-endef
+endif
 
 define Build/Configure
 
 define Build/Configure
-       rm -f $(PKG_BUILD_DIR)/.configured*
-       $(call Build/Configure/default)
-       $(call Build/Configure/mini)
+       $(Build/Configure/rebuild)
+       $(CP) ./files/$(BUILD_VARIANT).config $(PKG_BUILD_DIR)/hostapd/.config
 endef
 
 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
+
+ifdef CONFIG_PACKAGE_kmod-mac80211
+  TARGET_LDFLAGS += -lm -lnl-tiny
+endif
+
 define Build/Compile
 define Build/Compile
-       $(call Build/Compile/default)
-       $(call Build/Compile/mini)
+       CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
+       $(MAKE) -C $(PKG_BUILD_DIR)/hostapd \
+               $(TARGET_CONFIGURE_OPTS) \
+               $(DRIVER_MAKEOPTS) \
+               LIBS="$(TARGET_LDFLAGS)" \
+               hostapd hostapd_cli
 endef
 
 endef
 
-define Build/Clean
-       rm -rf $(PKG_BUILD_DIR)_default
-       rm -rf $(PKG_BUILD_DIR)_mini
+define Package/hostapd/install
+       $(INSTALL_DIR) $(1)/etc/hotplug.d/net
+       $(INSTALL_DATA) ./files/hostapd.hotplug $(1)/etc/hotplug.d/net/
+       $(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/hostapd $(1)/usr/sbin/
 endef
 endef
+Package/hostapd-mini/install = $(Package/hostapd/install)
 
 define Package/hostapd-utils/install
        $(INSTALL_DIR) $(1)/usr/sbin
 
 define Package/hostapd-utils/install
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd_cli $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd/hostapd_cli $(1)/usr/sbin/
 endef
 
 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))
 $(eval $(call BuildPackage,hostapd))
 $(eval $(call BuildPackage,hostapd-mini))
 $(eval $(call BuildPackage,hostapd-utils))
Personal OpenWRT clone
This page took 0.05419 seconds and 4 git commands to generate.