[package] kmod-libertas needs kmod-lib80211 to load

[openwrt.git] / package / hostapd / Makefile

diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index 0c1d6fc..ddf2168 100644 (file)
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -20,7 +20,6 @@ PKG_MD5SUM:=83630d11fa66ade9091f1b304fccd74c
 PKG_BUILD_DEPENDS:= \
        PACKAGE_kmod-madwifi:madwifi \
        PACKAGE_kmod-mac80211:mac80211 \
-       PACKAGE_kmod-mac80211:libnl \
 
 PKG_CONFIG_DEPENDS:= \
        CONFIG_PACKAGE_kmod-ath9k \
@@ -28,12 +27,14 @@ PKG_CONFIG_DEPENDS:= \
        CONFIG_PACKAGE_kmod-madwifi \
        CONFIG_PACKAGE_hostapd \
        CONFIG_PACKAGE_hostapd-mini \
+       CONFIG_PACKAGE_kmod-hostap
 
 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
@@ -41,7 +42,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 +PACKAGE_kmod-mac80211:libnl-tiny
 endef
 
 define Package/hostapd
@@ -94,13 +95,22 @@ define Build/ConfigureTarget
        $(CP) ./files/$(1).config $(PKG_BUILD_DIR)/hostapd.$(1)/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
+
 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)" \
+       CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
        $(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 $(CONFIG_PACKAGE_kmod-mac80211),-lm -lnl-tiny) \
                        $(if $(findstring default,$(1)),-lssl -lcrypto)" \
                hostapd hostapd_cli
        $(CP) $(PKG_BUILD_DIR)/hostapd.$(1)/hostapd/hostapd_cli $(PKG_BUILD_DIR)/