diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-11-16 03:10:56 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-11-16 03:10:56 +0000 |
| commit | 77a96c54371bb0f47d2e0d187b53b1b7dc63e885 (patch) | |
| tree | f75dc7eaabf7bd7baacc8cc8440484d88d3666e2 /package/hostapd/Makefile | |
| parent | 6fe9aab05af416e345d4a741f278dcb394490302 (diff) | |
| download | master-187ad058-77a96c54371bb0f47d2e0d187b53b1b7dc63e885.tar.gz master-187ad058-77a96c54371bb0f47d2e0d187b53b1b7dc63e885.tar.bz2 master-187ad058-77a96c54371bb0f47d2e0d187b53b1b7dc63e885.zip | |
fix up hostapd for mac80211
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9554 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/hostapd/Makefile')
| -rw-r--r-- | package/hostapd/Makefile | 60 |
1 files changed, 27 insertions, 33 deletions
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index 85f42dc6a1..d7910737b6 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -9,14 +9,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hostapd -PKG_VERSION:=0.5.8 +PKG_REV:=03ec0ec5cdb974d51a4a2a566bea4c4568138576 +PKG_VERSION:=20071107_$(PKG_REV) PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/ -PKG_MD5SUM:=40416b48cae9c78e5a2452caf214aff3 - -PKG_BUILD_DEPENDS:=madwifi +PKG_SOURCE_URL:=git://w1.fi/srv/git/hostap.git +PKG_SOURCE_SUBDIR:=hostapd-$(PKG_VERSION) +PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_BUILD_DEPENDS:=madwifi mac80211 include $(INCLUDE_DIR)/package.mk @@ -25,7 +26,7 @@ define Package/hostapd/Default CATEGORY:=Network TITLE:=IEEE 802.1x Authenticator URL:=http://hostap.epitest.fi/ - DEPENDS:=@!TARGET_avr32 @!TARGET_etrax + DEPENDS:=@!TARGET_avr32 @!TARGET_etrax $(if $(DUMP)$(CONFIG_LINUX_2_6_23),+libnl) endef define Package/hostapd @@ -34,9 +35,9 @@ $(call Package/hostapd/Default) DEPENDS+= +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 @@ -48,9 +49,9 @@ $(call Package/hostapd/Default) 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 @@ -69,38 +70,31 @@ define Package/hostapd-utils/description 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 + rm -rf $(PKG_BUILD_DIR)/hostapd.$(1) + $(CP) $(PKG_BUILD_DIR)/hostapd $(PKG_BUILD_DIR)/hostapd.$(1) + $(CP) ./files/$(1).config $(PKG_BUILD_DIR)/hostapd.$(1)/.config + [ -d $(STAGING_DIR)/usr/include/mac80211 ] || $(SED) 's,^CONFIG_DRIVER_DEVICESCAPE,#CONFIG_DRIVER_DEVICESCAPE,g' $(PKG_BUILD_DIR)/hostapd.$(1)/.config + [ -d $(STAGING_DIR)/usr/include/madwifi ] || $(SED) 's,^CONFIG_DRIVER_MADWIFI,#CONFIG_DRIVER_MADWIFI,g' $(PKG_BUILD_DIR)/hostapd.$(1)/.config endef define Build/CompileTarget - $(MAKE) -C $(PKG_BUILD_DIR)_$(1) \ + CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/madwifi -I$(STAGING_DIR)/usr/include/mac80211 -I$(STAGING_DIR)/usr/include" \ + $(MAKE) -C $(PKG_BUILD_DIR)/hostapd.$(1) \ $(TARGET_CONFIGURE_OPTS) \ - OPTFLAGS="$(TARGET_CFLAGS)" \ - CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/madwifi" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + LIBS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib \ + $(if $(wildcard $(STAGING_DIR)/usr/include/mac80211/*),-lnl)" \ hostapd hostapd_cli - $(CP) $(PKG_BUILD_DIR)_$(1)/hostapd_cli $(PKG_BUILD_DIR)/ + $(CP) $(PKG_BUILD_DIR)/hostapd.$(1)/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 +# config is managed through uci +# $(INSTALL_DIR) $$(1)/etc +# $(INSTALL_CONF) $(PKG_BUILD_DIR)/hostapd.$(2)/hostapd.conf $$(1)/etc/hostapd.conf $(INSTALL_DIR) $$(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)_$(2)/hostapd $$(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd.$(2)/hostapd $$(1)/usr/sbin/ endef define Package/Template |