Переглянути джерело

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 <yegorslists@googlemail.com>
Reviewed-by: Sergey Matyukevich <geomatsi@gmail.com>
[Arnout: add Config.in comment, simplify CONFIG_ENABLE]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
(cherry picked from commit 4bd8bbe9fb7e5c34e6062004de53948eff78e6c9)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Yegor Yefremov 3 роки тому
батько
коміт
f56e0361c5

+ 5 - 0
package/wpa_supplicant/Config.in

@@ -41,12 +41,17 @@ config BR2_PACKAGE_WPA_SUPPLICANT_WEXT
 
 
 config BR2_PACKAGE_WPA_SUPPLICANT_WIRED
 config BR2_PACKAGE_WPA_SUPPLICANT_WIRED
 	bool "Enable wired support"
 	bool "Enable wired support"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libnl
+	select BR2_PACKAGE_LIBNL
 	select BR2_PACKAGE_WPA_SUPPLICANT_EAP
 	select BR2_PACKAGE_WPA_SUPPLICANT_EAP
 	help
 	help
 	  Include the "wired" driver, so the internal IEEE 802.1x
 	  Include the "wired" driver, so the internal IEEE 802.1x
 	  supplicant can be used with Ethernet.  This also enables
 	  supplicant can be used with Ethernet.  This also enables
 	  support for MACSEC.
 	  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"
 comment "wpa_supplicant will be useless without at least one driver"
 	depends on !BR2_PACKAGE_WPA_SUPPLICANT_NL80211 && \
 	depends on !BR2_PACKAGE_WPA_SUPPLICANT_NL80211 && \
 		!BR2_PACKAGE_WPA_SUPPLICANT_WEXT && \
 		!BR2_PACKAGE_WPA_SUPPLICANT_WEXT && \

+ 9 - 2
package/wpa_supplicant/wpa_supplicant.mk

@@ -63,11 +63,18 @@ WPA_SUPPLICANT_CONFIG_DISABLE += \
 	CONFIG_FILS
 	CONFIG_FILS
 endif
 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 += \
 WPA_SUPPLICANT_CONFIG_DISABLE += \
 	CONFIG_DRIVER_WIRED \
 	CONFIG_DRIVER_WIRED \
 	CONFIG_MACSEC \
 	CONFIG_MACSEC \
-	CONFIG_DRIVER_MACSEC
+	CONFIG_DRIVER_MACSEC_LINUX
 endif
 endif
 
 
 ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT),)
 ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT),)