ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-06 19:19:31 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

hostapd: improve TITLE for packages

Browse Source 
For a few packages, the current TITLE is too long, so it is not
displayed at all when running make menuconfig. Despite, there is
no indication of OpenSSL vs. wolfSSL in the titles.

Thus, this patch adjusts titles to be generally shorter, and adds
the SSL variant to it.

While at it, make things easier by creating a shared definition for
eapol-test like it's done already for all the other flavors.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler 2020-07-30 16:25:51 +02:00 committed by Daniel Golle
parent 34705946e2
commit 917980fd8a
1 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
package/network/services/hostapd/Makefile
View File

@ -148,7 +148,7 @@ endef
define Package/hostapd define Package/hostapd
$(call Package/hostapd/Default,$(1)) $(call Package/hostapd/Default,$(1))
TITLE+= (full) TITLE+= (built-in full)
VARIANT:=full-internal VARIANT:=full-internal
endef endef
@ -159,7 +159,7 @@ endef
define Package/hostapd-openssl define Package/hostapd-openssl
$(call Package/hostapd/Default,$(1)) $(call Package/hostapd/Default,$(1))
TITLE+= (full) TITLE+= (OpenSSL full)
VARIANT:=full-openssl VARIANT:=full-openssl
DEPENDS+=+libopenssl DEPENDS+=+libopenssl
endef endef
@ -168,7 +168,7 @@ Package/hostapd-openssl/description = $(Package/hostapd/description)
define Package/hostapd-wolfssl define Package/hostapd-wolfssl
$(call Package/hostapd/Default,$(1)) $(call Package/hostapd/Default,$(1))
TITLE+= (full) TITLE+= (wolfSSL full)
VARIANT:=full-wolfssl VARIANT:=full-wolfssl
DEPENDS+=+libwolfssl DEPENDS+=+libwolfssl
endef endef
@ -177,7 +177,7 @@ Package/hostapd-wolfssl/description = $(Package/hostapd/description)
define Package/hostapd-basic define Package/hostapd-basic
$(call Package/hostapd/Default,$(1)) $(call Package/hostapd/Default,$(1))
TITLE+= (WPA-PSK, 11r and 11w) TITLE+= (WPA-PSK, 11r, 11w)
VARIANT:=basic VARIANT:=basic
endef endef
@ -200,7 +200,7 @@ define Package/wpad/Default
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
SUBMENU:=WirelessAPD SUBMENU:=WirelessAPD
TITLE:=IEEE 802.1x Authenticator/Supplicant TITLE:=IEEE 802.1x Auth/Supplicant
DEPENDS:=$(DRV_DEPENDS) +hostapd-common +libubus DEPENDS:=$(DRV_DEPENDS) +hostapd-common +libubus
URL:=http://hostap.epitest.fi/ URL:=http://hostap.epitest.fi/
PROVIDES:=hostapd wpa-supplicant PROVIDES:=hostapd wpa-supplicant
@ -211,7 +211,7 @@ endef
define Package/wpad define Package/wpad
$(call Package/wpad/Default,$(1)) $(call Package/wpad/Default,$(1))
TITLE+= (full) TITLE+= (built-in full)
VARIANT:=wpad-full-internal VARIANT:=wpad-full-internal
endef endef
@ -222,7 +222,7 @@ endef
define Package/wpad-openssl define Package/wpad-openssl
$(call Package/wpad/Default,$(1)) $(call Package/wpad/Default,$(1))
TITLE+= (full) TITLE+= (OpenSSL full)
VARIANT:=wpad-full-openssl VARIANT:=wpad-full-openssl
DEPENDS+=+libopenssl DEPENDS+=+libopenssl
endef endef
@ -231,7 +231,7 @@ Package/wpad-openssl/description = $(Package/wpad/description)
define Package/wpad-wolfssl define Package/wpad-wolfssl
$(call Package/wpad/Default,$(1)) $(call Package/wpad/Default,$(1))
TITLE+= (full) TITLE+= (wolfSSL full)
VARIANT:=wpad-full-wolfssl VARIANT:=wpad-full-wolfssl
DEPENDS+=+libwolfssl DEPENDS+=+libwolfssl
endef endef
@ -240,7 +240,7 @@ Package/wpad-wolfssl/description = $(Package/wpad/description)
define Package/wpad-basic define Package/wpad-basic
$(call Package/wpad/Default,$(1)) $(call Package/wpad/Default,$(1))
TITLE+= (WPA-PSK, 11r and 11w) TITLE+= (WPA-PSK, 11r, 11w)
VARIANT:=wpad-basic VARIANT:=wpad-basic
endef endef
@ -260,7 +260,6 @@ endef
define Package/wpad-mesh define Package/wpad-mesh
$(call Package/wpad/Default,$(1)) $(call Package/wpad/Default,$(1))
TITLE+= (with 802.11s mesh and SAE support)
DEPENDS+=@PACKAGE_kmod-cfg80211 @(!TARGET_uml||BROKEN) DEPENDS+=@PACKAGE_kmod-cfg80211 @(!TARGET_uml||BROKEN)
PROVIDES+=wpa-supplicant-mesh wpad-mesh PROVIDES+=wpa-supplicant-mesh wpad-mesh
endef endef
@ -271,6 +270,7 @@ endef
define Package/wpad-mesh-openssl define Package/wpad-mesh-openssl
$(call Package/wpad-mesh,$(1)) $(call Package/wpad-mesh,$(1))
TITLE+= (OpenSSL, 11s, SAE)
DEPENDS+=+libopenssl DEPENDS+=+libopenssl
VARIANT:=wpad-mesh-openssl VARIANT:=wpad-mesh-openssl
endef endef
@ -279,6 +279,7 @@ Package/wpad-mesh-openssl/description = $(Package/wpad-mesh/description)
define Package/wpad-mesh-wolfssl define Package/wpad-mesh-wolfssl
$(call Package/wpad-mesh,$(1)) $(call Package/wpad-mesh,$(1))
TITLE+= (wolfSSL, 11s, SAE)
DEPENDS+=+libwolfssl DEPENDS+=+libwolfssl
VARIANT:=wpad-mesh-wolfssl VARIANT:=wpad-mesh-wolfssl
endef endef
@ -300,17 +301,20 @@ endef
define Package/wpa-supplicant define Package/wpa-supplicant
$(call Package/wpa-supplicant/Default,$(1)) $(call Package/wpa-supplicant/Default,$(1))
TITLE+= (built-in full)
VARIANT:=supplicant-full-internal VARIANT:=supplicant-full-internal
endef endef
define Package/wpa-supplicant-openssl define Package/wpa-supplicant-openssl
$(call Package/wpa-supplicant/Default,$(1)) $(call Package/wpa-supplicant/Default,$(1))
TITLE+= (OpenSSL full)
VARIANT:=supplicant-full-openssl VARIANT:=supplicant-full-openssl
DEPENDS+=+libopenssl DEPENDS+=+libopenssl
endef endef
define Package/wpa-supplicant-wolfssl define Package/wpa-supplicant-wolfssl
$(call Package/wpa-supplicant/Default,$(1)) $(call Package/wpa-supplicant/Default,$(1))
TITLE+= (wolfSSL full)
VARIANT:=supplicant-full-wolfssl VARIANT:=supplicant-full-wolfssl
DEPENDS+=+libwolfssl DEPENDS+=+libwolfssl
endef endef
@ -321,39 +325,40 @@ endef
define Package/wpa-supplicant-p2p define Package/wpa-supplicant-p2p
$(call Package/wpa-supplicant/Default,$(1)) $(call Package/wpa-supplicant/Default,$(1))
TITLE+= (with Wi-Fi P2P support) TITLE+= (Wi-Fi P2P support)
DEPENDS+=@PACKAGE_kmod-cfg80211 DEPENDS+=@PACKAGE_kmod-cfg80211
VARIANT:=supplicant-p2p-internal VARIANT:=supplicant-p2p-internal
endef endef
define Package/wpa-supplicant-mesh/Default define Package/wpa-supplicant-mesh/Default
$(call Package/wpa-supplicant/Default,$(1)) $(call Package/wpa-supplicant/Default,$(1))
TITLE+= (with 802.11s and SAE)
DEPENDS+=@PACKAGE_kmod-cfg80211 @(!TARGET_uml||BROKEN) DEPENDS+=@PACKAGE_kmod-cfg80211 @(!TARGET_uml||BROKEN)
PROVIDES+=wpa-supplicant-mesh PROVIDES+=wpa-supplicant-mesh
endef endef
define Package/wpa-supplicant-mesh-openssl define Package/wpa-supplicant-mesh-openssl
$(call Package/wpa-supplicant-mesh/Default,$(1)) $(call Package/wpa-supplicant-mesh/Default,$(1))
TITLE+= (OpenSSL, 11s, SAE)
VARIANT:=supplicant-mesh-openssl VARIANT:=supplicant-mesh-openssl
DEPENDS+=+libopenssl DEPENDS+=+libopenssl
endef endef
define Package/wpa-supplicant-mesh-wolfssl define Package/wpa-supplicant-mesh-wolfssl
$(call Package/wpa-supplicant-mesh/Default,$(1)) $(call Package/wpa-supplicant-mesh/Default,$(1))
TITLE+= (wolfSSL, 11s, SAE)
VARIANT:=supplicant-mesh-wolfssl VARIANT:=supplicant-mesh-wolfssl
DEPENDS+=+libwolfssl DEPENDS+=+libwolfssl
endef endef
define Package/wpa-supplicant-basic define Package/wpa-supplicant-basic
$(call Package/wpa-supplicant/Default,$(1)) $(call Package/wpa-supplicant/Default,$(1))
TITLE+= (with 11r and 11w) TITLE+= (11r, 11w)
VARIANT:=supplicant-basic VARIANT:=supplicant-basic
endef endef
define Package/wpa-supplicant-mini define Package/wpa-supplicant-mini
$(call Package/wpa-supplicant/Default,$(1)) $(call Package/wpa-supplicant/Default,$(1))
TITLE+= (minimal version) TITLE+= (minimal)
VARIANT:=supplicant-mini VARIANT:=supplicant-mini
endef endef
@ -387,34 +392,35 @@ define Package/wpa-cli
TITLE:=WPA Supplicant command line control utility TITLE:=WPA Supplicant command line control utility
endef endef
define Package/eapol-test define Package/eapol-test/Default
TITLE:=802.1x authentication test utility TITLE:=802.1x auth test utility
SECTION:=net SECTION:=net
SUBMENU:=WirelessAPD SUBMENU:=WirelessAPD
CATEGORY:=Network CATEGORY:=Network
VARIANT:=supplicant-full-internal
DEPENDS:=$(DRV_DEPENDS) +libubus DEPENDS:=$(DRV_DEPENDS) +libubus
endef 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 define Package/eapol-test-openssl
TITLE:=802.1x authentication test utility $(call Package/eapol-test/Default,$(1))
SECTION:=net TITLE+= (OpenSSL full)
CATEGORY:=Network
SUBMENU:=WirelessAPD
VARIANT:=supplicant-full-openssl VARIANT:=supplicant-full-openssl
CONFLICTS:=$(filter-out eapol-test-openssl ,$(EAPOL_TEST_PROVIDERS)) CONFLICTS:=$(filter-out eapol-test-openssl ,$(EAPOL_TEST_PROVIDERS))
DEPENDS:=$(DRV_DEPENDS) +libubus +libopenssl DEPENDS+=+libopenssl
PROVIDES:=eapol-test PROVIDES:=eapol-test
endef endef
define Package/eapol-test-wolfssl define Package/eapol-test-wolfssl
TITLE:=802.1x authentication test utility $(call Package/eapol-test/Default,$(1))
SECTION:=net TITLE+= (wolfSSL full)
CATEGORY:=Network
SUBMENU:=WirelessAPD
VARIANT:=supplicant-full-wolfssl VARIANT:=supplicant-full-wolfssl
CONFLICTS:=$(filter-out eapol-test-openssl ,$(filter-out eapol-test-wolfssl ,$(EAPOL_TEST_PROVIDERS))) CONFLICTS:=$(filter-out eapol-test-openssl ,$(filter-out eapol-test-wolfssl ,$(EAPOL_TEST_PROVIDERS)))
DEPENDS:=$(DRV_DEPENDS) +libubus +libwolfssl DEPENDS+=+libwolfssl
PROVIDES:=eapol-test PROVIDES:=eapol-test
endef endef