Add a basic variant which provides WPA-PSK only, 802.11r and 802.11w.
Signed-off-by: Kevin Darbyshire-Bryant
---
include/target.mk | 2 +-
package/network/services/hostapd/Config.in| 6 +
package/network/services/hostapd/Makefile | 37 ++
.../hostapd/files/hostapd-basic.config| 380 +++
.../hostapd/files/wpa_supplicant-basic.config | 593 ++
5 files changed, 1017 insertions(+), 1 deletion(-)
create mode 100644 package/network/services/hostapd/files/hostapd-basic.config
create mode 100644
package/network/services/hostapd/files/wpa_supplicant-basic.config
diff --git a/include/target.mk b/include/target.mk
index 88beae5001..1d6888fde3 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -59,7 +59,7 @@ endif
DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEVICE_TYPE))
filter_packages = $(filter-out -% $(patsubst -%,%,$(filter -%,$(1))),$(1))
-extra_packages = $(if $(filter wpad-mini wpad nas,$(1)),iwinfo)
+extra_packages = $(if $(filter wpad-mini wpad-basic wpad nas,$(1)),iwinfo)
define ProfileDefault
NAME:=
diff --git a/package/network/services/hostapd/Config.in
b/package/network/services/hostapd/Config.in
index 222cfb7f13..578fba839c 100644
--- a/package/network/services/hostapd/Config.in
+++ b/package/network/services/hostapd/Config.in
@@ -6,11 +6,13 @@ config WPA_SUPPLICANT_NO_TIMESTAMP_CHECK
PACKAGE_wpa-supplicant-wolfssl || \
PACKAGE_wpa-supplicant-mesh-openssl || \
PACKAGE_wpa-supplicant-mesh-wolfssl || \
+ PACKAGE_wpa-supplicant-basic || \
PACKAGE_wpa-supplicant-mini || \
PACKAGE_wpa-supplicant-p2p || \
PACKAGE_wpad || \
PACKAGE_wpad-openssl || \
PACKAGE_wpad-wolfssl || \
+ PACKAGE_wpad-basic || \
PACKAGE_wpad-mini || \
PACKAGE_wpad-mesh-openssl || \
PACKAGE_wpad-mesh-wolfssl
@@ -26,11 +28,13 @@ config WPA_RFKILL_SUPPORT
PACKAGE_wpa-supplicant-wolfssl || \
PACKAGE_wpa-supplicant-mesh-openssl || \
PACKAGE_wpa-supplicant-mesh-wolfssl || \
+ PACKAGE_wpa-supplicant-basic || \
PACKAGE_wpa-supplicant-mini || \
PACKAGE_wpa-supplicant-p2p || \
PACKAGE_wpad || \
PACKAGE_wpad-openssl || \
PACKAGE_wpad-wolfssl || \
+ PACKAGE_wpad-basic || \
PACKAGE_wpad-mini || \
PACKAGE_wpad-mesh-openssl || \
PACKAGE_wpad-mesh-wolfssl
@@ -43,11 +47,13 @@ config WPA_MSG_MIN_PRIORITY
PACKAGE_wpa-supplicant-wolfssl || \
PACKAGE_wpa-supplicant-mesh-openssl || \
PACKAGE_wpa-supplicant-mesh-wolfssl || \
+ PACKAGE_wpa-supplicant-basic || \
PACKAGE_wpa-supplicant-mini || \
PACKAGE_wpa-supplicant-p2p || \
PACKAGE_wpad || \
PACKAGE_wpad-openssl || \
PACKAGE_wpad-wolfssl || \
+ PACKAGE_wpad-basic || \
PACKAGE_wpad-mini || \
PACKAGE_wpad-mesh-openssl || \
PACKAGE_wpad-mesh-wolfssl
diff --git a/package/network/services/hostapd/Makefile
b/package/network/services/hostapd/Makefile
index a5c5379738..1b67216676 100644
--- a/package/network/services/hostapd/Makefile
+++ b/package/network/services/hostapd/Makefile
@@ -26,6 +26,7 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_kmod-ath9k \
CONFIG_PACKAGE_kmod-cfg80211 \
CONFIG_PACKAGE_hostapd \
+ CONFIG_PACKAGE_hostapd-basic \
CONFIG_PACKAGE_hostapd-mini \
CONFIG_WPA_RFKILL_SUPPORT \
CONFIG_DRIVER_WEXT_SUPPORT \
@@ -95,6 +96,10 @@ ifeq ($(LOCAL_VARIANT),full)
DRIVER_MAKEOPTS += CONFIG_IEEE80211W=$(CONFIG_DRIVER_11W_SUPPORT)
endif
+ifeq ($(LOCAL_VARIANT),basic)
+ DRIVER_MAKEOPTS += CONFIG_IEEE80211W=$(CONFIG_DRIVER_11W_SUPPORT)
+endif
+
ifeq ($(LOCAL_VARIANT),full)
ifeq ($(SSL_VARIANT),openssl)
DRIVER_MAKEOPTS += CONFIG_TLS=openssl
@@ -176,6 +181,16 @@ endef
Package/hostapd-wolfssl/description = $(Package/hostapd/description)
+define Package/hostapd-basic
+$(call Package/hostapd/Default,$(1))
+ TITLE+= (WPA-PSK, 11r and 11w)
+ VARIANT:=basic
+endef
+
+define Package/hostapd-basic/description
+ This package contains a basic IEEE 802.1x/WPA Authenticator with WPA-PSK,
802.11r and 802.11w support.
+endef
+
define Package/hostapd-mini
$(call Package/hostapd/Default,$(1))
TITLE+= (WPA-PSK only)
@@ -228,6 +243,16 @@ endef
Package/wpad-wolfssl/description = $(Package/wpad/description)
+define Package/wpad-basic
+$(call Package/wpad/Default,$(1))
+ TITLE+= (WPA-PSK, 11r and 11w)
+ VARIANT:=wpad-basic
+endef
+
+define
