projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[ar7] let 802.1q tagged frames go in and out from cpmac (#6730)
[openwrt.git] / package / hostapd / Makefile
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index a39b0e2..e6e2313 100644 (file)
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostapd
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostapd
-PKG_VERSION:=20091111
+PKG_VERSION:=20100117
 PKG_RELEASE:=1
 PKG_RELEASE:=1
-PKG_REV:=dc6d9ac250f793a62b21ca828445967fb484305f
+PKG_REV:=43a7fe2e0e614e52fa05ff4d78af91bd4e17d3b2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=git://w1.fi/srv/git/hostap.git
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=git://w1.fi/srv/git/hostap.git
@@ -23,6 +23,7 @@ PKG_BUILD_DEPENDS:= \
        PACKAGE_kmod-mac80211:mac80211 \
 
 PKG_CONFIG_DEPENDS:= \
        PACKAGE_kmod-mac80211:mac80211 \
 
 PKG_CONFIG_DEPENDS:= \
+       CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK \
        CONFIG_PACKAGE_kmod-ath9k \
        CONFIG_PACKAGE_kmod-mac80211 \
        CONFIG_PACKAGE_kmod-madwifi \
        CONFIG_PACKAGE_kmod-ath9k \
        CONFIG_PACKAGE_kmod-mac80211 \
        CONFIG_PACKAGE_kmod-madwifi \
@@ -30,6 +31,21 @@ PKG_CONFIG_DEPENDS:= \
        CONFIG_PACKAGE_hostapd-mini \
        CONFIG_PACKAGE_kmod-hostap
 
        CONFIG_PACKAGE_hostapd-mini \
        CONFIG_PACKAGE_kmod-hostap
 
+LOCAL_TYPE=$(strip \
+               $(if $(findstring wpad,$(BUILD_VARIANT)),wpad, \
+               $(if $(findstring supplicant,$(BUILD_VARIANT)),supplicant, \
+               hostapd \
+       )))
+LOCAL_VARIANT=$(patsubst wpad-%,%,$(patsubst supplicant-%,%,$(BUILD_VARIANT)))
+
+ifeq ($(LOCAL_TYPE),supplicant)
+  ifeq ($(LOCAL_VARIANT),full)
+    PKG_CONFIG_DEPENDS += \
+               CONFIG_WPA_SUPPLICANT_INTERNAL \
+               CONFIG_WPA_SUPPLICANT_OPENSSL
+  endif
+endif
+
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
@@ -40,12 +56,27 @@ DRIVER_MAKEOPTS= \
        CONFIG_DRIVER_HOSTAP=$(CONFIG_PACKAGE_kmod-hostap) \
        CONFIG_IEEE80211N=$(CONFIG_PACKAGE_kmod-ath9k)
 
        CONFIG_DRIVER_HOSTAP=$(CONFIG_PACKAGE_kmod-hostap) \
        CONFIG_IEEE80211N=$(CONFIG_PACKAGE_kmod-ath9k)
 
+ifeq ($(LOCAL_TYPE),supplicant)
+  ifeq ($(LOCAL_VARIANT),full)
+    DRIVER_MAKEOPTS += $(if $(CONFIG_WPA_SUPPLICANT_OPENSSL),CONFIG_TLS=openssl)
+  endif
+endif
+
+ifneq ($(LOCAL_TYPE),hostapd)
+  ifdef CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK
+    TARGET_CFLAGS += -DNO_TIMESTAMP_CHECK
+  endif
+  DRIVER_MAKEOPTS += \
+       CONFIG_DRIVER_ROBOSWITCH=$(CONFIG_PACKAGE_kmod-switch)
+endif
+
 define Package/hostapd/Default
   SECTION:=net
   CATEGORY:=Network
   TITLE:=IEEE 802.1x Authenticator
   URL:=http://hostap.epitest.fi/
 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
+  DEPENDS:=@!TARGET_avr32 @!TARGET_etrax +PACKAGE_kmod-mac80211:libnl-tiny +PACKAGE_kmod-mac80211:crda
+  MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 endef
 
 define Package/hostapd
 endef
 
 define Package/hostapd
@@ -80,10 +111,92 @@ define Package/hostapd-utils/description
  IEEE 802.1x/WPA/EAP/RADIUS Authenticator.
 endef
 
  IEEE 802.1x/WPA/EAP/RADIUS Authenticator.
 endef
 
-define Build/Configure
+define Package/wpad/Default
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=IEEE 802.1x Authenticator/Supplicant
+  URL:=http://hostap.epitest.fi/
+  DEPENDS:=@!TARGET_avr32 @!TARGET_etrax +PACKAGE_kmod-mac80211:libnl-tiny +PACKAGE_kmod-mac80211:crda
+  MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+endef
+
+define Package/wpad
+$(call Package/wpad/Default)
+  TITLE+= (full)
+  VARIANT:=wpad-full
+endef
+
+define Package/wpad/description
+ This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS
+ Authenticator and Supplicant
+endef
+
+define Package/wpad-mini
+$(call Package/wpad/Default)
+  TITLE+= (WPA-PSK only)
+  VARIANT:=wpad-mini
+endef
+
+define Package/wpad-mini/description
+ This package contains a minimal IEEE 802.1x/WPA Authenticator and Supplicant (WPA-PSK only).
+endef
+
+define Package/wpa-supplicant
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=WPA Supplicant
+  URL:=http://hostap.epitest.fi/wpa_supplicant/
+  DEPENDS:=@!TARGET_avr32 @!TARGET_etrax +PACKAGE_kmod-mac80211:libnl-tiny +PACKAGE_kmod-mac80211:crda
+  VARIANT:=supplicant-full
+  MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+endef
+
+define Package/wpa-supplicant/Description
+  WPA Supplicant
+endef
+
+define Package/wpa-supplicant/config
+       source "$(SOURCE)/Config.in"
+endef
+
+define Package/wpa-supplicant-mini
+  $(Package/wpa-supplicant)
+  TITLE:=WPA Supplicant (minimal version)
+  DEPENDS:=$(if $(CONFIG_WPA_SUPPLICANT_OPENSSL),+libopenssl)
+  VARIANT:=supplicant-mini
+endef
+
+define Package/wpa-supplicant-mini/Description
+  WPA Supplicant (minimal version)
+endef
+
+define Package/wpa-cli
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=wpa-supplicant
+  TITLE:=WPA Supplicant command line interface
+  MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+endef
+
+define Package/wpa-cli/Description
+  WPA Supplicant control utility
+endef
+
+
+ifneq ($(wildcard $(PKG_BUILD_DIR)/.config_*),$(subst .configured_,.config_,$(STAMP_CONFIGURED)))
+  define Build/Configure/rebuild
+       $(FIND) $(PKG_BUILD_DIR) -name \*.o -or -name \*.a | $(XARGS) rm -f
        rm -f $(PKG_BUILD_DIR)/hostapd/hostapd
        rm -f $(PKG_BUILD_DIR)/hostapd/hostapd
-       rm -f $(PKG_BUILD_DIR)/src/drivers/drivers.o
-       $(CP) ./files/$(BUILD_VARIANT).config $(PKG_BUILD_DIR)/hostapd/.config
+       rm -f $(PKG_BUILD_DIR)/wpa_supplicant/wpa_supplicant
+       rm -f $(PKG_BUILD_DIR)/.config_*
+       touch $(subst .configured_,.config_,$(STAMP_CONFIGURED))
+  endef
+endif
+
+define Build/Configure
+       $(Build/Configure/rebuild)
+       $(CP) ./files/hostapd-$(LOCAL_VARIANT).config $(PKG_BUILD_DIR)/hostapd/.config
+       $(CP) ./files/wpa_supplicant-$(LOCAL_VARIANT).config $(PKG_BUILD_DIR)/wpa_supplicant/.config
 endef
 
 TARGET_CPPFLAGS := \
 endef
 
 TARGET_CPPFLAGS := \
@@ -99,35 +212,109 @@ ifdef CONFIG_PACKAGE_kmod-mac80211
   TARGET_LDFLAGS += -lm -lnl-tiny
 endif
 
   TARGET_LDFLAGS += -lm -lnl-tiny
 endif
 
-define Build/Compile
+define Build/RunMake
        CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
        CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
-       $(MAKE) -C $(PKG_BUILD_DIR)/hostapd \
+       $(MAKE) -C $(PKG_BUILD_DIR)/$(1) \
                $(TARGET_CONFIGURE_OPTS) \
                $(DRIVER_MAKEOPTS) \
                LIBS="$(TARGET_LDFLAGS)" \
                $(TARGET_CONFIGURE_OPTS) \
                $(DRIVER_MAKEOPTS) \
                LIBS="$(TARGET_LDFLAGS)" \
-               hostapd hostapd_cli
+               $(2)
+endef
+
+define Build/Compile/wpad
+       echo ` \
+               $(call Build/RunMake,hostapd,-s MULTICALL=1 dump_cflags); \
+               $(call Build/RunMake,wpa_supplicant,-s dump_cflags) | \
+               sed -e 's,-n ,,g' -e 's,$(TARGET_CFLAGS),,' \
+       ` > $(PKG_BUILD_DIR)/.cflags
+       $(call Build/RunMake,hostapd, \
+               CFLAGS="$$$$(cat $(PKG_BUILD_DIR)/.cflags)" \
+               MULTICALL=1 \
+               hostapd_cli hostapd_multi.a \
+       )
+       $(call Build/RunMake,wpa_supplicant, \
+               CFLAGS="$$$$(cat $(PKG_BUILD_DIR)/.cflags)" \
+               MULTICALL=1 \
+               wpa_cli wpa_supplicant_multi.a \
+       )
+       $(TARGET_CC) -o $(PKG_BUILD_DIR)/wpad \
+               $(TARGET_CFLAGS) \
+               ./files/multicall.c \
+               $(PKG_BUILD_DIR)/hostapd/hostapd_multi.a \
+               $(PKG_BUILD_DIR)/wpa_supplicant/wpa_supplicant_multi.a \
+               $(TARGET_LDFLAGS)
+endef
+
+define Build/Compile/hostapd
+       $(call Build/RunMake,hostapd, \
+               hostapd hostapd_cli \
+       )
+endef
+
+define Build/Compile/supplicant
+       $(call Build/RunMake,wpa_supplicant, \
+               wpa_cli wpa_supplicant \
+       )
 endef
 
 endef
 
-define Package/InstallTemplate
+define Build/Compile
+       $(Build/Compile/$(LOCAL_TYPE))
+endef
+
+define Install/hostapd
        $(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_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
+endef
+
+define Install/supplicant
+       $(INSTALL_DIR) $(1)/lib/wifi
+       $(INSTALL_DATA) ./files/wpa_supplicant.sh $(1)/lib/wifi/wpa_supplicant.sh
+       $(INSTALL_DIR) $(1)/usr/sbin
+endef
+
+define Package/hostapd/install
+       $(call Install/hostapd,$(1))
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd/hostapd $(1)/usr/sbin/
 endef
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd/hostapd $(1)/usr/sbin/
 endef
+Package/hostapd-mini/install = $(Package/hostapd/install)
 
 
-ifeq ($(BUILD_VARIANT),full)
-  Package/hostapd/install = $(Package/InstallTemplate)
-else
-  Package/hostapd-mini/install = $(Package/InstallTemplate)
+ifneq ($(LOCAL_TYPE),supplicant)
+  define Package/hostapd-utils/install
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd/hostapd_cli $(1)/usr/sbin/
+  endef
 endif
 
 endif
 
-define Package/hostapd-utils/install
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd_cli $(1)/usr/sbin/
+define Package/wpad/install
+       $(call Install/hostapd,$(1))
+       $(call Install/supplicant,$(1))
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/wpad $(1)/usr/sbin/
+       ln -sf wpad $(1)/usr/sbin/hostapd
+       ln -sf wpad $(1)/usr/sbin/wpa_supplicant
+endef
+Package/wpad-mini/install = $(Package/wpad/install)
+
+define Package/wpa-supplicant/install
+       $(call Install/supplicant,$(1))
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/wpa_supplicant/wpa_supplicant $(1)/usr/sbin/
 endef
 endef
+Package/wpa-supplicant-mini/install = $(Package/wpa-supplicant/install)
+
+ifneq ($(LOCAL_TYPE),hostapd)
+  define Package/wpa-cli/install
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(CP) $(PKG_BUILD_DIR)/wpa_supplicant/wpa_cli $(1)/usr/sbin/
+  endef
+endif
 
 $(eval $(call BuildPackage,hostapd))
 $(eval $(call BuildPackage,hostapd-mini))
 
 $(eval $(call BuildPackage,hostapd))
 $(eval $(call BuildPackage,hostapd-mini))
+$(eval $(call BuildPackage,wpad))
+$(eval $(call BuildPackage,wpad-mini))
+$(eval $(call BuildPackage,wpa-supplicant))
+$(eval $(call BuildPackage,wpa-supplicant-mini))
+$(eval $(call BuildPackage,wpa-cli))
 $(eval $(call BuildPackage,hostapd-utils))
 $(eval $(call BuildPackage,hostapd-utils))
Personal OpenWRT clone
This page took 0.027428 seconds and 4 git commands to generate.