domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hostapd: remove hostapd-hs20 variant

Browse Source 
Hotspot 2.0 AP features have been made available in the -full variants
of hostapd and wpad. Hence we no longer need a seperate package for
that.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle
2020-10-29 12:50:47 +00:00
parent 10e73b1e9e
commit c3a4cddaaf
1 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,9 +68,6 @@ CONFIG_VARIANT:=$(LOCAL_VARIANT)
ifeq ($(LOCAL_VARIANT),mesh) ifeq ($(LOCAL_VARIANT),mesh)
CONFIG_VARIANT:=full CONFIG_VARIANT:=full
endif endif
ifeq ($(LOCAL_VARIANT),hs20)
CONFIG_VARIANT:=full
endif
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@@ -111,10 +108,6 @@ ifeq ($(SSL_VARIANT),openssl)
ifeq ($(LOCAL_VARIANT),full) ifeq ($(LOCAL_VARIANT),full)
DRIVER_MAKEOPTS += CONFIG_OWE=y CONFIG_SUITEB192=y CONFIG_AP=y CONFIG_MESH=y DRIVER_MAKEOPTS += CONFIG_OWE=y CONFIG_SUITEB192=y CONFIG_AP=y CONFIG_MESH=y
endif endif
ifeq ($(LOCAL_VARIANT),hs20)
DRIVER_MAKEOPTS += CONFIG_OWE=y CONFIG_SUITEB192=y CONFIG_AP=y CONFIG_MESH=y CONFIG_DPP=y CONFIG_HS20=y CONFIG_INTERWORKING=y
endif
endif endif
ifeq ($(SSL_VARIANT),wolfssl) ifeq ($(SSL_VARIANT),wolfssl)
@@ -175,15 +168,6 @@ endef
Package/hostapd-openssl/description = $(Package/hostapd/description) Package/hostapd-openssl/description = $(Package/hostapd/description)
define Package/hostapd-hs20
$(call Package/hostapd/Default,$(1))
TITLE+= (OpenSSL with Hotspot 2.0)
VARIANT:=hs20-openssl
DEPENDS+=+libopenssl
endef
Package/hostapd-hs20/description = $(Package/hostapd/description)
define Package/hostapd-wolfssl define Package/hostapd-wolfssl
$(call Package/hostapd/Default,$(1)) $(call Package/hostapd/Default,$(1))
TITLE+= (wolfSSL full) TITLE+= (wolfSSL full)
@@ -608,7 +592,6 @@ define Package/hostapd/install
endef endef
Package/hostapd-basic/install = $(Package/hostapd/install) Package/hostapd-basic/install = $(Package/hostapd/install)
Package/hostapd-basic-openssl/install = $(Package/hostapd/install) Package/hostapd-basic-openssl/install = $(Package/hostapd/install)
Package/hostapd-hs20/install = $(Package/hostapd/install)
Package/hostapd-mini/install = $(Package/hostapd/install) Package/hostapd-mini/install = $(Package/hostapd/install)
Package/hostapd-openssl/install = $(Package/hostapd/install) Package/hostapd-openssl/install = $(Package/hostapd/install)
Package/hostapd-wolfssl/install = $(Package/hostapd/install) Package/hostapd-wolfssl/install = $(Package/hostapd/install)
@@ -679,7 +662,6 @@ endif
$(eval $(call BuildPackage,hostapd)) $(eval $(call BuildPackage,hostapd))
$(eval $(call BuildPackage,hostapd-basic)) $(eval $(call BuildPackage,hostapd-basic))
$(eval $(call BuildPackage,hostapd-basic-openssl)) $(eval $(call BuildPackage,hostapd-basic-openssl))
$(eval $(call BuildPackage,hostapd-hs20))
$(eval $(call BuildPackage,hostapd-mini)) $(eval $(call BuildPackage,hostapd-mini))
$(eval $(call BuildPackage,hostapd-openssl)) $(eval $(call BuildPackage,hostapd-openssl))
$(eval $(call BuildPackage,hostapd-wolfssl)) $(eval $(call BuildPackage,hostapd-wolfssl))