Forced using wpad-openssl

_base.config

@@ -124,12 +124,11 @@ CONFIG_PACKAGE_6rd=y
 ### IPv6 NAT support (ip6tables NAT extensions, ipt-nat6 and nf-nat6 kmods)
 ##CONFIG_PACKAGE_ip6tables-mod-nat=y
 
-### hostap
-CONFIG_PACKAGE_hostapd-openssl=y
-CONFIG_PACKAGE_hostapd-utils=y
-
 ### OpenSSL
 CONFIG_LIBCURL_OPENSSL=y
+CONFIG_PACKAGE_libopenssl=y
+CONFIG_PACKAGE_libopenssl-legacy=y
+#CONFIG_PACKAGE_libopenssl-devcrypto=y
 CONFIG_PACKAGE_openssl-util=y
 CONFIG_PACKAGE_libwebsockets-full=y
 CONFIG_PACKAGE_libuhttpd-openssl=y
@@ -183,11 +182,14 @@ CONFIG_PACKAGE_collectd-mod-ping=y
 CONFIG_PACKAGE_collectd-mod-thermal=y
 CONFIG_PACKAGE_collectd-mod-uptime=y
 
-### WLAN/WPS support
-CONFIG_PACKAGE_wpa-supplicant-openssl=y
+### hostap
+#CONFIG_PACKAGE_hostapd-openssl=y
+#CONFIG_PACKAGE_hostapd-utils=y
+## https://forum.openwrt.org/t/wpad-vs-hostapd-wpa-supplicant/30844
+## WPAD included wpa-supplicant + hostapd
 CONFIG_PACKAGE_wpad-openssl=y
-CONFIG_WPA_SUPPLICANT_INTERNAL=y
 CONFIG_WPA_RFKILL_SUPPORT=y
+#CONFIG_PACKAGE_wpa-supplicant-openssl=y
 ## CONFIG_WPA_MSG_MIN_PRIORITY=2
 ## CONFIG_WPA_MSG_MIN_PRIORITY=4
 

xmake.sh

@@ -94,6 +94,14 @@ if [ "$TARGET_INITRAMFS_FORCE" = y ]; then
 	sed -i '/CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE=y/d' $CFG
 fi
 
+wpad_openssl=$( get_cfg_pkg_flag $XDIR/__current.config wpad-openssl )
+if [ "$wpad_openssl" = y ]; then
+	logmsg "Forced using wpad-openssl !!!"
+	sed -i 's/CONFIG_PACKAGE_wpad-basic-mbedtls=/# CONFIG_PACKAGE_wpad-basic-mbedtls=/g' $CFG
+	sed -i '/CONFIG_PACKAGE_wpad-openssl=/d' $CFG
+	echo -e "\nCONFIG_PACKAGE_wpad-openssl=y\n" >> $CFG
+fi
+
 NETPORTSDIR=$XDIR/package/addons/luci-app-tn-netports/root/etc/config
 if [ -d $NETPORTSDIR ]; then
 	rm -f $NETPORTSDIR/luci_netports