From da80fd41563911cfa46aa94afd626310565251c2 Mon Sep 17 00:00:00 2001 From: Tian Yuanhao Date: Fri, 2 Apr 2021 19:23:16 -0700 Subject: [PATCH] package/wpa_supplicant: handle CONFIG_CTRL_IFACE carefully When BR2_PACKAGE_WPA_SUPPLICANT_CTRL_IFACE is not set and BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y, CONFIG_CTRL_IFACE_DBUS_NEW will be enabled by 's/^#\(CONFIG_CTRL_IFACE_DBUS_NEW\)/\1/' first, and then disabled by 's/^\(CONFIG_CTRL_IFACE\)/#\1/'. CONFIG_CTRL_IFACE_DBUS_NEW does not depend on CONFIG_CTRL_IFACE, except for using it as a prefix. Fix this wrong behavior by adding '\>' after CONFIG_CTRL_IFACE. Signed-off-by: Tian Yuanhao Tested-by: Nicolas Cavallari Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/wpa_supplicant/wpa_supplicant.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index 96f0596bfe..356ea91828 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -138,7 +138,7 @@ WPA_SUPPLICANT_CONFIG_EDITS += 's/\#\(CONFIG_TLS=\).*/\1internal/' endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_CTRL_IFACE),) -WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_CTRL_IFACE +WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_CTRL_IFACE\> endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS),y) -- 2.30.2