From 1c6143e4a0a7cfd9721d74b0194aabd9a5a6cff4 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Sat, 4 Apr 2020 12:42:13 +0100 Subject: [PATCH] hostapd: Move hostapd variants to WirelessAPD menu It seemed very confusing when trying to select the different variants of hostapd which are somewhat scattered about under the menu 'Network'. Moving all hostapd variants under a common submenu helps avoid confusion. Inspired-by: Kevin Mahoney [Fixup badly formatted patch, change menu name] Signed-off-by: Kevin Darbyshire-Bryant --- package/network/services/hostapd/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile index f6e089ddb3c..7472f5904eb 100644 --- a/package/network/services/hostapd/Makefile +++ b/package/network/services/hostapd/Makefile @@ -130,6 +130,7 @@ DRV_DEPENDS:=+PACKAGE_kmod-cfg80211:libnl-tiny define Package/hostapd/Default SECTION:=net CATEGORY:=Network + SUBMENU:=WirelessAPD TITLE:=IEEE 802.1x Authenticator URL:=http://hostap.epitest.fi/ DEPENDS:=$(DRV_DEPENDS) +hostapd-common +libubus @@ -191,6 +192,7 @@ endef define Package/wpad/Default SECTION:=net CATEGORY:=Network + SUBMENU:=WirelessAPD TITLE:=IEEE 802.1x Authenticator/Supplicant DEPENDS:=$(DRV_DEPENDS) +hostapd-common +libubus URL:=http://hostap.epitest.fi/ @@ -280,6 +282,7 @@ Package/wpad-mesh-wolfssl/description = $(Package/wpad-mesh/description) define Package/wpa-supplicant/Default SECTION:=net CATEGORY:=Network + SUBMENU:=WirelessAPD TITLE:=WPA Supplicant URL:=http://hostap.epitest.fi/wpa_supplicant/ DEPENDS:=$(DRV_DEPENDS) +hostapd-common +libubus @@ -352,11 +355,13 @@ define Package/hostapd-common TITLE:=hostapd/wpa_supplicant common support files SECTION:=net CATEGORY:=Network + SUBMENU:=WirelessAPD endef define Package/hostapd-utils SECTION:=net CATEGORY:=Network + SUBMENU:=WirelessAPD TITLE:=IEEE 802.1x Authenticator (utils) URL:=http://hostap.epitest.fi/ DEPENDS:=@$(subst $(space),||,$(foreach pkg,$(HOSTAPD_PROVIDERS),PACKAGE_$(pkg))) @@ -370,6 +375,7 @@ endef define Package/wpa-cli SECTION:=net CATEGORY:=Network + SUBMENU:=WirelessAPD DEPENDS:=@$(subst $(space),||,$(foreach pkg,$(SUPPLICANT_PROVIDERS),PACKAGE_$(pkg))) TITLE:=WPA Supplicant command line control utility endef @@ -377,6 +383,7 @@ endef define Package/eapol-test TITLE:=802.1x authentication test utility SECTION:=net + SUBMENU:=WirelessAPD CATEGORY:=Network VARIANT:=supplicant-full-internal DEPENDS:=$(DRV_DEPENDS) +libubus @@ -386,6 +393,7 @@ define Package/eapol-test-openssl TITLE:=802.1x authentication test utility SECTION:=net CATEGORY:=Network + SUBMENU:=WirelessAPD VARIANT:=supplicant-full-openssl CONFLICTS:=$(filter-out eapol-test-openssl ,$(EAPOL_TEST_PROVIDERS)) DEPENDS:=$(DRV_DEPENDS) +libubus +libopenssl @@ -396,6 +404,7 @@ define Package/eapol-test-wolfssl TITLE:=802.1x authentication test utility SECTION:=net CATEGORY:=Network + SUBMENU:=WirelessAPD VARIANT:=supplicant-full-wolfssl CONFLICTS:=$(filter-out eapol-test-openssl ,$(filter-out eapol-test-wolfssl ,$(EAPOL_TEST_PROVIDERS))) DEPENDS:=$(DRV_DEPENDS) +libubus +libwolfssl -- 2.30.2