diff options
| -rw-r--r-- | package/hostapd/Makefile | 25 | ||||
| -rw-r--r-- | package/hostapd/files/default.config | 2 | ||||
| -rw-r--r-- | package/hostapd/files/mini.config | 2 |
3 files changed, 23 insertions, 6 deletions
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index 86ce41457..22f0dab74 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -9,14 +9,21 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hostapd -PKG_VERSION:=0.5.7 +PKG_VERSION:=0.5.8 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/ -PKG_MD5SUM:=d5113247dc6ee17106e6bc7cb89aa507 +PKG_MD5SUM:=40416b48cae9c78e5a2452caf214aff3 -PKG_BUILD_DEPENDS:=madwifi +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 include $(INCLUDE_DIR)/package.mk @@ -65,13 +72,19 @@ 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 define Build/CompileTarget $(MAKE) -C $(PKG_BUILD_DIR)_$(1) \ $(TARGET_CONFIGURE_OPTS) \ OPTFLAGS="$(TARGET_CFLAGS)" \ - CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/madwifi" \ + CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/madwifi -I$(STAGING_DIR)/usr/include/mac80211" \ LDFLAGS="$(TARGET_LDFLAGS)" \ hostapd hostapd_cli $(CP) $(PKG_BUILD_DIR)_$(1)/hostapd_cli $(PKG_BUILD_DIR)/ @@ -85,7 +98,11 @@ define Package/InstallTemplate $(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/ endef diff --git a/package/hostapd/files/default.config b/package/hostapd/files/default.config index e2237d6d8..de27420b9 100644 --- a/package/hostapd/files/default.config +++ b/package/hostapd/files/default.config @@ -16,7 +16,7 @@ CONFIG_DRIVER_HOSTAP=y #CONFIG_DRIVER_WIRED=y # Driver interface for madwifi driver -CONFIG_DRIVER_MADWIFI=y +#CONFIG_DRIVER_MADWIFI=y #CFLAGS += -I../head # change to reflect local setup; directory for madwifi src # Driver interface for Prism54 driver diff --git a/package/hostapd/files/mini.config b/package/hostapd/files/mini.config index 912bee8d7..cfdc485ee 100644 --- a/package/hostapd/files/mini.config +++ b/package/hostapd/files/mini.config @@ -16,7 +16,7 @@ CONFIG_DRIVER_HOSTAP=y #CONFIG_DRIVER_WIRED=y # Driver interface for madwifi driver -CONFIG_DRIVER_MADWIFI=y +#CONFIG_DRIVER_MADWIFI=y #CFLAGS += -I../head # change to reflect local setup; directory for madwifi src # Driver interface for Prism54 driver |