aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/network/services/hostapd/Makefile60
1 files changed, 33 insertions, 27 deletions
diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
index 91c3876378..d738605b5a 100644
--- a/package/network/services/hostapd/Makefile
+++ b/package/network/services/hostapd/Makefile
@@ -148,7 +148,7 @@ endef
define Package/hostapd
$(call Package/hostapd/Default,$(1))
- TITLE+= (full)
+ TITLE+= (built-in full)
VARIANT:=full-internal
endef
@@ -159,7 +159,7 @@ endef
define Package/hostapd-openssl
$(call Package/hostapd/Default,$(1))
- TITLE+= (full)
+ TITLE+= (OpenSSL full)
VARIANT:=full-openssl
DEPENDS+=+libopenssl
endef
@@ -168,7 +168,7 @@ Package/hostapd-openssl/description = $(Package/hostapd/description)
define Package/hostapd-wolfssl
$(call Package/hostapd/Default,$(1))
- TITLE+= (full)
+ TITLE+= (wolfSSL full)
VARIANT:=full-wolfssl
DEPENDS+=+libwolfssl
endef
@@ -177,7 +177,7 @@ Package/hostapd-wolfssl/description = $(Package/hostapd/description)
define Package/hostapd-basic
$(call Package/hostapd/Default,$(1))
- TITLE+= (WPA-PSK, 11r and 11w)
+ TITLE+= (WPA-PSK, 11r, 11w)
VARIANT:=basic
endef
@@ -200,7 +200,7 @@ define Package/wpad/Default
SECTION:=net
CATEGORY:=Network
SUBMENU:=WirelessAPD
- TITLE:=IEEE 802.1x Authenticator/Supplicant
+ TITLE:=IEEE 802.1x Auth/Supplicant
DEPENDS:=$(DRV_DEPENDS) +hostapd-common +libubus
URL:=http://hostap.epitest.fi/
PROVIDES:=hostapd wpa-supplicant
@@ -211,7 +211,7 @@ endef
define Package/wpad
$(call Package/wpad/Default,$(1))
- TITLE+= (full)
+ TITLE+= (built-in full)
VARIANT:=wpad-full-internal
endef
@@ -222,7 +222,7 @@ endef
define Package/wpad-openssl
$(call Package/wpad/Default,$(1))
- TITLE+= (full)
+ TITLE+= (OpenSSL full)
VARIANT:=wpad-full-openssl
DEPENDS+=+libopenssl
endef
@@ -231,7 +231,7 @@ Package/wpad-openssl/description = $(Package/wpad/description)
define Package/wpad-wolfssl
$(call Package/wpad/Default,$(1))
- TITLE+= (full)
+ TITLE+= (wolfSSL full)
VARIANT:=wpad-full-wolfssl
DEPENDS+=+libwolfssl
endef
@@ -240,7 +240,7 @@ Package/wpad-wolfssl/description = $(Package/wpad/description)
define Package/wpad-basic
$(call Package/wpad/Default,$(1))
- TITLE+= (WPA-PSK, 11r and 11w)
+ TITLE+= (WPA-PSK, 11r, 11w)
VARIANT:=wpad-basic
endef
@@ -260,7 +260,6 @@ endef
define Package/wpad-mesh
$(call Package/wpad/Default,$(1))
- TITLE+= (with 802.11s mesh and SAE support)
DEPENDS+=@PACKAGE_kmod-cfg80211 @(!TARGET_uml||BROKEN)
PROVIDES+=wpa-supplicant-mesh wpad-mesh
endef
@@ -271,6 +270,7 @@ endef
define Package/wpad-mesh-openssl
$(call Package/wpad-mesh,$(1))
+ TITLE+= (OpenSSL, 11s, SAE)
DEPENDS+=+libopenssl
VARIANT:=wpad-mesh-openssl
endef
@@ -279,6 +279,7 @@ Package/wpad-mesh-openssl/description = $(Package/wpad-mesh/description)
define Package/wpad-mesh-wolfssl
$(call Package/wpad-mesh,$(1))
+ TITLE+= (wolfSSL, 11s, SAE)
DEPENDS+=+libwolfssl
VARIANT:=wpad-mesh-wolfssl
endef
@@ -300,17 +301,20 @@ endef
define Package/wpa-supplicant
$(call Package/wpa-supplicant/Default,$(1))
+ TITLE+= (built-in full)
VARIANT:=supplicant-full-internal
endef
define Package/wpa-supplicant-openssl
$(call Package/wpa-supplicant/Default,$(1))
+ TITLE+= (OpenSSL full)
VARIANT:=supplicant-full-openssl
DEPENDS+=+libopenssl
endef
define Package/wpa-supplicant-wolfssl
$(call Package/wpa-supplicant/Default,$(1))
+ TITLE+= (wolfSSL full)
VARIANT:=supplicant-full-wolfssl
DEPENDS+=+libwolfssl
endef
@@ -321,39 +325,40 @@ endef
define Package/wpa-supplicant-p2p
$(call Package/wpa-supplicant/Default,$(1))
- TITLE+= (with Wi-Fi P2P support)
+ TITLE+= (Wi-Fi P2P support)
DEPENDS+=@PACKAGE_kmod-cfg80211
VARIANT:=supplicant-p2p-internal
endef
define Package/wpa-supplicant-mesh/Default
$(call Package/wpa-supplicant/Default,$(1))
- TITLE+= (with 802.11s and SAE)
DEPENDS+=@PACKAGE_kmod-cfg80211 @(!TARGET_uml||BROKEN)
PROVIDES+=wpa-supplicant-mesh
endef
define Package/wpa-supplicant-mesh-openssl
$(call Package/wpa-supplicant-mesh/Default,$(1))
+ TITLE+= (OpenSSL, 11s, SAE)
VARIANT:=supplicant-mesh-openssl
DEPENDS+=+libopenssl
endef
define Package/wpa-supplicant-mesh-wolfssl
$(call Package/wpa-supplicant-mesh/Default,$(1))
+ TITLE+= (wolfSSL, 11s, SAE)
VARIANT:=supplicant-mesh-wolfssl
DEPENDS+=+libwolfssl
endef
define Package/wpa-supplicant-basic
$(call Package/wpa-supplicant/Default,$(1))
- TITLE+= (with 11r and 11w)
+ TITLE+= (11r, 11w)
VARIANT:=supplicant-basic
endef
define Package/wpa-supplicant-mini
$(call Package/wpa-supplicant/Default,$(1))
- TITLE+= (minimal version)
+ TITLE+= (minimal)
VARIANT:=supplicant-mini
endef
@@ -387,34 +392,35 @@ define Package/wpa-cli
TITLE:=WPA Supplicant command line control utility
endef
-define Package/eapol-test
- TITLE:=802.1x authentication test utility
+define Package/eapol-test/Default
+ TITLE:=802.1x auth test utility
SECTION:=net
SUBMENU:=WirelessAPD
CATEGORY:=Network
- VARIANT:=supplicant-full-internal
DEPENDS:=$(DRV_DEPENDS) +libubus
endef
+define Package/eapol-test
+ $(call Package/eapol-test/Default,$(1))
+ TITLE+= (built-in full)
+ VARIANT:=supplicant-full-internal
+endef
+
define Package/eapol-test-openssl
- TITLE:=802.1x authentication test utility
- SECTION:=net
- CATEGORY:=Network
- SUBMENU:=WirelessAPD
+ $(call Package/eapol-test/Default,$(1))
+ TITLE+= (OpenSSL full)
VARIANT:=supplicant-full-openssl
CONFLICTS:=$(filter-out eapol-test-openssl ,$(EAPOL_TEST_PROVIDERS))
- DEPENDS:=$(DRV_DEPENDS) +libubus +libopenssl
+ DEPENDS+=+libopenssl
PROVIDES:=eapol-test
endef
define Package/eapol-test-wolfssl
- TITLE:=802.1x authentication test utility
- SECTION:=net
- CATEGORY:=Network
- SUBMENU:=WirelessAPD
+ $(call Package/eapol-test/Default,$(1))
+ TITLE+= (wolfSSL full)
VARIANT:=supplicant-full-wolfssl
CONFLICTS:=$(filter-out eapol-test-openssl ,$(filter-out eapol-test-wolfssl ,$(EAPOL_TEST_PROVIDERS)))
- DEPENDS:=$(DRV_DEPENDS) +libubus +libwolfssl
+ DEPENDS+=+libwolfssl
PROVIDES:=eapol-test
endef