summaryrefslogtreecommitdiff
path: root/package/hostapd
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-03-28 17:09:52 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-03-28 17:09:52 +0000
commit744a57c58fcee49f5b762fd0b34c263cb616258e (patch)
treebba594a5fc75684af8c5d21ff8a49da7795fb2c7 /package/hostapd
parent6eb6ec83e426f1727d8adbef52d2ec4141531fbe (diff)
downloadmtk-20170518-744a57c58fcee49f5b762fd0b34c263cb616258e.zip
mtk-20170518-744a57c58fcee49f5b762fd0b34c263cb616258e.tar.gz
mtk-20170518-744a57c58fcee49f5b762fd0b34c263cb616258e.tar.bz2
hostapd: clean up openssl tls dependencies and build handling (fixes #6572)
SVN-Revision: 20547
Diffstat (limited to 'package/hostapd')
-rw-r--r--package/hostapd/Config.in2
-rw-r--r--package/hostapd/Makefile23
2 files changed, 14 insertions, 11 deletions
diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in
index e185820..1989338 100644
--- a/package/hostapd/Config.in
+++ b/package/hostapd/Config.in
@@ -10,7 +10,7 @@ config WPA_SUPPLICANT_NO_TIMESTAMP_CHECK
choice
prompt "Choose TLS provider"
default WPA_SUPPLICANT_INTERNAL
- depends PACKAGE_wpa-supplicant
+ depends PACKAGE_wpa-supplicant || PACKAGE_wpad
config WPA_SUPPLICANT_INTERNAL
bool "internal"
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index 4c261f3..f4142f7 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -57,13 +57,13 @@ DRIVER_MAKEOPTS= \
CONFIG_IEEE80211N=$(CONFIG_PACKAGE_kmod-ath9k) \
CONFIG_IEEE80211W=$(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_OPENSSL
+ ifeq ($(LOCAL_VARIANT),full)
+ DRIVER_MAKEOPTS += CONFIG_TLS=openssl
+ TARGET_LDFLAGS += -lcrypto -lssl
+ endif
+ endif
ifdef CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK
TARGET_CFLAGS += -DNO_TIMESTAMP_CHECK
endif
@@ -71,12 +71,14 @@ ifneq ($(LOCAL_TYPE),hostapd)
CONFIG_DRIVER_ROBOSWITCH=$(CONFIG_PACKAGE_kmod-switch)
endif
+DRV_DEPENDS:=+PACKAGE_kmod-mac80211:libnl-tiny +PACKAGE_kmod-mac80211:crda @(!(TARGET_avr32||TARGET_etrax)||BROKEN)
+
define Package/hostapd/Default
SECTION:=net
CATEGORY:=Network
TITLE:=IEEE 802.1x Authenticator
URL:=http://hostap.epitest.fi/
- DEPENDS:= +PACKAGE_kmod-mac80211:libnl-tiny +PACKAGE_kmod-mac80211:crda @(!(TARGET_avr32||TARGET_etrax)||BROKEN)
+ DEPENDS:=$(DRV_DEPENDS)
MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
endef
@@ -117,13 +119,13 @@ define Package/wpad/Default
CATEGORY:=Network
TITLE:=IEEE 802.1x Authenticator/Supplicant
URL:=http://hostap.epitest.fi/
- DEPENDS:= +PACKAGE_kmod-mac80211:libnl-tiny +PACKAGE_kmod-mac80211:crda @(!(TARGET_avr32||TARGET_etrax)||BROKEN)
MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
endef
define Package/wpad
$(call Package/wpad/Default)
TITLE+= (full)
+ DEPENDS:=$(DRV_DEPENDS) +WPA_SUPPLICANT_OPENSSL:libopenssl
VARIANT:=wpad-full
endef
@@ -135,6 +137,7 @@ endef
define Package/wpad-mini
$(call Package/wpad/Default)
TITLE+= (WPA-PSK only)
+ DEPENDS:=$(DRV_DEPENDS)
VARIANT:=wpad-mini
endef
@@ -147,7 +150,7 @@ define Package/wpa-supplicant
CATEGORY:=Network
TITLE:=WPA Supplicant
URL:=http://hostap.epitest.fi/wpa_supplicant/
- DEPENDS:= +PACKAGE_kmod-mac80211:libnl-tiny +PACKAGE_kmod-mac80211:crda @(!(TARGET_avr32||TARGET_etrax)||BROKEN)
+ DEPENDS:=$(DRV_DEPENDS) +WPA_SUPPLICANT_OPENSSL:libopenssl
VARIANT:=supplicant-full
MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
endef
@@ -163,7 +166,7 @@ endef
define Package/wpa-supplicant-mini
$(Package/wpa-supplicant)
TITLE:=WPA Supplicant (minimal version)
- DEPENDS:=$(if $(CONFIG_WPA_SUPPLICANT_OPENSSL),+libopenssl)
+ DEPENDS:=$(DRV_DEPENDS)
VARIANT:=supplicant-mini
endef