]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
wpa-supplicant: update config for gnutls
authorKai Kang <kai.kang@windriver.com>
Fri, 29 Apr 2022 07:04:28 +0000 (15:04 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 3 May 2022 16:44:31 +0000 (17:44 +0100)
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>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb

index aee56578d2e278459b061de59fa3bd7d0bc1abdd..4e27b92bc69232997babec8ff36b56bd08ba6e19 100644 (file)
@@ -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