Backups/immortalwrt-mt798x
1
0
Fork 0
mirror of https://github.com/hanwckf/immortalwrt-mt798x.git synced 2025-01-10 11:09:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

hostapd: Move hostapd variants to WirelessAPD menu

Browse Source 
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 <kevin.mahoney@zenotec.net>
[Fixup badly formatted patch, change menu name]
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
This commit is contained in:
Kevin Darbyshire-Bryant 2020-04-04 12:42:13 +01:00
parent 22ae8bd50e
commit 1c6143e4a0
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,6 +130,7 @@ DRV_DEPENDS:=+PACKAGE_kmod-cfg80211:libnl-tiny
define Package/hostapd/Default define Package/hostapd/Default
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
SUBMENU:=WirelessAPD
TITLE:=IEEE 802.1x Authenticator TITLE:=IEEE 802.1x Authenticator
URL:=http://hostap.epitest.fi/ URL:=http://hostap.epitest.fi/
DEPENDS:=$(DRV_DEPENDS) +hostapd-common +libubus DEPENDS:=$(DRV_DEPENDS) +hostapd-common +libubus
@ -191,6 +192,7 @@ endef
define Package/wpad/Default define Package/wpad/Default
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
SUBMENU:=WirelessAPD
TITLE:=IEEE 802.1x Authenticator/Supplicant TITLE:=IEEE 802.1x Authenticator/Supplicant
DEPENDS:=$(DRV_DEPENDS) +hostapd-common +libubus DEPENDS:=$(DRV_DEPENDS) +hostapd-common +libubus
URL:=http://hostap.epitest.fi/ URL:=http://hostap.epitest.fi/
@ -280,6 +282,7 @@ Package/wpad-mesh-wolfssl/description = $(Package/wpad-mesh/description)
define Package/wpa-supplicant/Default define Package/wpa-supplicant/Default
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
SUBMENU:=WirelessAPD
TITLE:=WPA Supplicant TITLE:=WPA Supplicant
URL:=http://hostap.epitest.fi/wpa_supplicant/ URL:=http://hostap.epitest.fi/wpa_supplicant/
DEPENDS:=$(DRV_DEPENDS) +hostapd-common +libubus DEPENDS:=$(DRV_DEPENDS) +hostapd-common +libubus
@ -352,11 +355,13 @@ define Package/hostapd-common
TITLE:=hostapd/wpa_supplicant common support files TITLE:=hostapd/wpa_supplicant common support files
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
SUBMENU:=WirelessAPD
endef endef
define Package/hostapd-utils define Package/hostapd-utils
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
SUBMENU:=WirelessAPD
TITLE:=IEEE 802.1x Authenticator (utils) TITLE:=IEEE 802.1x Authenticator (utils)
URL:=http://hostap.epitest.fi/ URL:=http://hostap.epitest.fi/
DEPENDS:=@$(subst $(space),||,$(foreach pkg,$(HOSTAPD_PROVIDERS),PACKAGE_$(pkg))) DEPENDS:=@$(subst $(space),||,$(foreach pkg,$(HOSTAPD_PROVIDERS),PACKAGE_$(pkg)))
@ -370,6 +375,7 @@ endef
define Package/wpa-cli define Package/wpa-cli
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
SUBMENU:=WirelessAPD
DEPENDS:=@$(subst $(space),||,$(foreach pkg,$(SUPPLICANT_PROVIDERS),PACKAGE_$(pkg))) DEPENDS:=@$(subst $(space),||,$(foreach pkg,$(SUPPLICANT_PROVIDERS),PACKAGE_$(pkg)))
TITLE:=WPA Supplicant command line control utility TITLE:=WPA Supplicant command line control utility
endef endef
@ -377,6 +383,7 @@ endef
define Package/eapol-test define Package/eapol-test
TITLE:=802.1x authentication test utility TITLE:=802.1x authentication test utility
SECTION:=net SECTION:=net
SUBMENU:=WirelessAPD
CATEGORY:=Network CATEGORY:=Network
VARIANT:=supplicant-full-internal VARIANT:=supplicant-full-internal
DEPENDS:=$(DRV_DEPENDS) +libubus DEPENDS:=$(DRV_DEPENDS) +libubus
@ -386,6 +393,7 @@ define Package/eapol-test-openssl
TITLE:=802.1x authentication test utility TITLE:=802.1x authentication test utility
SECTION:=net SECTION:=net
CATEGORY:=Network 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:=$(DRV_DEPENDS) +libubus +libopenssl
@ -396,6 +404,7 @@ define Package/eapol-test-wolfssl
TITLE:=802.1x authentication test utility TITLE:=802.1x authentication test utility
SECTION:=net SECTION:=net
CATEGORY:=Network 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:=$(DRV_DEPENDS) +libubus +libwolfssl