From f56e0361c5493cf0b3d0c02fe570ac609c372841 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 11 Apr 2022 11:07:23 +0200 Subject: [PATCH] package/wpa_supplicant: enable libnl for the WIRED driver BR2_PACKAGE_WPA_SUPPLICANT_WIRED also enables the MACSEC_LINUX driver. This driver requires libnl. Also fix CONFIG_DRIVER_MACSEC option to enable only the generic Linux driver and not QCA extensions. Fixes: http://autobuild.buildroot.net/results/2dea7dee521794b306cc610601fda322987e6cd0 Signed-off-by: Yegor Yefremov Reviewed-by: Sergey Matyukevich [Arnout: add Config.in comment, simplify CONFIG_ENABLE] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 4bd8bbe9fb7e5c34e6062004de53948eff78e6c9) Signed-off-by: Peter Korsgaard --- package/wpa_supplicant/Config.in | 5 +++++ package/wpa_supplicant/wpa_supplicant.mk | 11 +++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in index 8f095cdf2d..f2b0754ee1 100644 --- a/package/wpa_supplicant/Config.in +++ b/package/wpa_supplicant/Config.in @@ -41,12 +41,17 @@ config BR2_PACKAGE_WPA_SUPPLICANT_WEXT config BR2_PACKAGE_WPA_SUPPLICANT_WIRED bool "Enable wired support" + depends on BR2_TOOLCHAIN_HAS_THREADS # libnl + select BR2_PACKAGE_LIBNL select BR2_PACKAGE_WPA_SUPPLICANT_EAP help Include the "wired" driver, so the internal IEEE 802.1x supplicant can be used with Ethernet. This also enables support for MACSEC. +comment "wired support needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + comment "wpa_supplicant will be useless without at least one driver" depends on !BR2_PACKAGE_WPA_SUPPLICANT_NL80211 && \ !BR2_PACKAGE_WPA_SUPPLICANT_WEXT && \ diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index f0eb36e083..5ad4aa10a7 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -63,11 +63,18 @@ WPA_SUPPLICANT_CONFIG_DISABLE += \ CONFIG_FILS endif -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WIRED),) +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WIRED),y) +WPA_SUPPLICANT_DEPENDENCIES += host-pkgconf libnl +WPA_SUPPLICANT_CONFIG_ENABLE += \ + CONFIG_LIBNL32 \ + CONFIG_DRIVER_WIRED \ + CONFIG_MACSEC \ + CONFIG_DRIVER_MACSEC_LINUX +else WPA_SUPPLICANT_CONFIG_DISABLE += \ CONFIG_DRIVER_WIRED \ CONFIG_MACSEC \ - CONFIG_DRIVER_MACSEC + CONFIG_DRIVER_MACSEC_LINUX endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT),)