wpa-supplicant: update config for gnutls

Message ID 20220429070428.19718-1-kai.kang@windriver.com
State Accepted, archived
Commit 3a43c2a82881688d85238464db371f695e60b572
Headers show
Series wpa-supplicant: update config for gnutls | expand

Commit Message

Kai April 29, 2022, 7:04 a.m. UTC
From: Kai Kang <kai.kang@windriver.com>

It fails to build wpa-supplicant with gnutls by setting PACKAGECONFIG
with 'gnutls':

| wpa_supplicant/../src/eap_common/eap_pwd_common.c:440: undefined
    reference to `crypto_ec_point_deinit'

Disable 3 configure options CONFIG_DPP, CONFIG_EAP_PWD and CONFIG_SAE to
make it work with gnutls.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 .../wpa-supplicant/wpa-supplicant_2.10.bb                    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Patch

diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb
index aee56578d2e..4e27b92bc69 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb
@@ -35,12 +35,15 @@  EXTRA_OEMAKE = "'LIBDIR=${libdir}' 'INCDIR=${includedir}' 'BINDIR=${sbindir}'"
 
 do_configure () {
 	${MAKE} -C wpa_supplicant clean
-	sed -e '/CONFIG_TLS=/d' <wpa_supplicant/defconfig >wpa_supplicant/.config
+	sed -e '/^CONFIG_TLS=/d' <wpa_supplicant/defconfig >wpa_supplicant/.config
 
 	if ${@ bb.utils.contains('PACKAGECONFIG', 'openssl', 'true', 'false', d) }; then
 		echo 'CONFIG_TLS=openssl' >>wpa_supplicant/.config
 	elif ${@ bb.utils.contains('PACKAGECONFIG', 'gnutls', 'true', 'false', d) }; then
 		echo 'CONFIG_TLS=gnutls' >>wpa_supplicant/.config
+        sed -i -e 's/\(^CONFIG_DPP=\)/#\1/' \
+               -e 's/\(^CONFIG_EAP_PWD=\)/#\1/' \
+               -e 's/\(^CONFIG_SAE=\)/#\1/' wpa_supplicant/.config
 	fi
 
 	# For rebuild