X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/057e4cdd71714328318e93a0574c816976452886..1fc2b717c59f1ce91c385c443705aad5e77c08df:/package/hostapd/Makefile diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index 3c402ea1c..6b4679616 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -1,132 +1,138 @@ -# -# 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.7 +PKG_VERSION:=20100108 PKG_RELEASE:=1 +PKG_REV:=d97572a40fd7ec77094e2e4ef83424a4c0f7e24d + +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_PROTO:=git -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/ -PKG_MD5SUM:=d5113247dc6ee17106e6bc7cb89aa507 -PKG_CAT:=zcat +PKG_BUILD_DEPENDS:= \ + PACKAGE_kmod-madwifi:madwifi \ + PACKAGE_kmod-mac80211:mac80211 \ -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_CONFIG_DEPENDS:= \ + CONFIG_PACKAGE_kmod-ath9k \ + CONFIG_PACKAGE_kmod-mac80211 \ + CONFIG_PACKAGE_kmod-madwifi \ + CONFIG_PACKAGE_hostapd \ + CONFIG_PACKAGE_hostapd-mini \ + CONFIG_PACKAGE_kmod-hostap -PKG_BUILDDEP:=madwifi +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) \ + CONFIG_DRIVER_HOSTAP=$(CONFIG_PACKAGE_kmod-hostap) \ + 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 +$(call Package/hostapd/Default) TITLE+= (full) - DESCRIPTION:=\ - This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS \\\ - Authenticator. + VARIANT:=full endef -define Package/hostapd/conffiles -/etc/hostapd.conf +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) +$(call Package/hostapd/Default) TITLE+= (WPA-PSK only) - DESCRIPTION:=\ - This package contains a minimal IEEE 802.1x/WPA/EAP/RADIUS Authenticator \\\ - (WPA-PSK only). + VARIANT:=mini endef -define Package/hostapd-mini/conffiles -/etc/hostapd.conf +define Package/hostapd-mini/description + This package contains a minimal IEEE 802.1x/WPA Authenticator (WPA-PSK only). 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) - $(CP) ./files/$(1).config $(PKG_BUILD_DIR)_$(1)/.config -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" \ - hostapd hostapd_cli - $(CP) $(PKG_BUILD_DIR)_$(1)/hostapd_cli $(PKG_BUILD_DIR)/ + DEPENDS:=@PACKAGE_hostapd||PACKAGE_hostapd-mini 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)/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/ +define Package/hostapd-utils/description + This package contains a command line utility to control the + IEEE 802.1x/WPA/EAP/RADIUS Authenticator. 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)) +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 - define Package/$(1)/install - $(call Package/InstallTemplate,$(1),$(2)) - endef - endif -endef +endif define Build/Configure - $(call Build/Configure/default) - $(call Build/Configure/mini) + $(Build/Configure/rebuild) + $(CP) ./files/$(BUILD_VARIANT).config $(PKG_BUILD_DIR)/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 + +ifdef CONFIG_PACKAGE_kmod-mac80211 + TARGET_LDFLAGS += -lm -lnl-tiny +endif + 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 -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 +Package/hostapd-mini/install = $(Package/hostapd/install) 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 -$(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))