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:=
-
-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_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 libnl openssl
include $(INCLUDE_DIR)/package.mk
+STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_kmod-mac80211 CONFIG_PACKAGE_kmod-madwifi CONFIG_PACKAGE_hostapd CONFIG_PACKAGE_hostapd-mini)
define Package/hostapd/Default
SECTION:=net
CATEGORY:=Network
TITLE:=IEEE 802.1x Authenticator
URL:=http://hostap.epitest.fi/
+ DEPENDS:=@!TARGET_avr32 @!TARGET_etrax
endef
define Package/hostapd
- $(call Package/hostapd/Default)
- DEPENDS:=+libopenssl @!TARGET_AVR32 @!TARGET_ETRAX
+$(call Package/hostapd/Default)
TITLE+= (full)
- DESCRIPTION:=\
- This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS \\\
- Authenticator.
+ DEPENDS+= +libopenssl
endef
-define Package/hostapd/conffiles
-/etc/hostapd.conf
+#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)
- DEPENDS:=@!TARGET_AVR32 @!TARGET_ETRAX
+$(call Package/hostapd/Default)
TITLE+= (WPA-PSK only)
- DESCRIPTION:=\
- This package contains a minimal IEEE 802.1x/WPA/EAP/RADIUS Authenticator \\\
- (WPA-PSK only).
endef
-define Package/hostapd-mini/conffiles
-/etc/hostapd.conf
+#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)
- 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.
+ 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
-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
+ 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
+ $(if $(CONFIG_PACKAGE_kmod-mac80211),,$(SED) 's,^CONFIG_DRIVER_NL80211,#CONFIG_DRIVER_NL80211,g' $(PKG_BUILD_DIR)/hostapd.$(1)/hostapd/.config)
+ $(if $(CONFIG_PACKAGE_kmod-madwifi),,$(SED) 's,^CONFIG_DRIVER_MADWIFI,#CONFIG_DRIVER_MADWIFI,g' $(PKG_BUILD_DIR)/hostapd.$(1)/hostapd/.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/libnl -I$(STAGING_DIR)/usr/include" \
+ $(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)" \
+ LIBS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib \
+ $(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)_$(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
endef
define Build/Configure
+ rm -f $(PKG_BUILD_DIR)/.configured*
$(call Build/Configure/default)
$(call Build/Configure/mini)
endef
projects / openwrt.git / blobdiff