All the mail mirrored from lore.kernel.org
 help / color / mirror / Atom feed
From: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] package/wpa_supplicant: fix WPA_SUPPLICANT_CONFIGURE_CMDS
Date: Tue, 16 Mar 2021 11:02:17 +0100	[thread overview]
Message-ID: <9d4e31b1-2b0b-b9e8-662f-ad4d64b083e3@green-communications.fr> (raw)
In-Reply-To: <20210316021804.3790808-1-tianyuanhao@aliyun.com>

On 16/03/2021 03:18, Tian Yuanhao via buildroot wrote:
> When "BR2_PACKAGE_WPA_SUPPLICANT_CTRL_IFACE=n" and
> "BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y" are set,
> "CONFIG_CTRL_IFACE_DBUS_NEW" will be enabled by
> "-e 's/^#\(CONFIG_CTRL_IFACE_DBUS_NEW\)/\1/'" first, and then disabled
> by "-e 's/^\(CONFIG_CTRL_IFACE\)/#\1/'".
> 
> Fix it by adding an "=" at the end.
> 
> Signed-off-by: Tian Yuanhao <tianyuanhao@aliyun.com>
> ---
>   package/wpa_supplicant/wpa_supplicant.mk | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
> index c82db43c1c..7941a00748 100644
> --- a/package/wpa_supplicant/wpa_supplicant.mk
> +++ b/package/wpa_supplicant/wpa_supplicant.mk
> @@ -185,8 +185,8 @@ endif
>   
>   define WPA_SUPPLICANT_CONFIGURE_CMDS
>   	cp $(@D)/wpa_supplicant/defconfig $(WPA_SUPPLICANT_CONFIG)
> -	sed -i $(patsubst %,-e 's/^#\(%\)/\1/',$(WPA_SUPPLICANT_CONFIG_ENABLE)) \
> -		$(patsubst %,-e 's/^\(%\)/#\1/',$(WPA_SUPPLICANT_CONFIG_DISABLE)) \
> +	sed -i $(patsubst %,-e 's/^#\(%=\)/\1/',$(WPA_SUPPLICANT_CONFIG_ENABLE)) \
> +		$(patsubst %,-e 's/^\(%=\)/#\1/',$(WPA_SUPPLICANT_CONFIG_DISABLE)) \
>   		$(patsubst %,-e '1i%=y',$(WPA_SUPPLICANT_CONFIG_SET)) \
>   		$(patsubst %,-e %,$(WPA_SUPPLICANT_CONFIG_EDITS)) \
>   		$(WPA_SUPPLICANT_CONFIG)

Unfortunately, this behavior is expected so that all CONFIG_EAP_* 
options can be disabled with CONFIG_DISABLE += CONFIG_EAP

I don't see any immediate solution, other that to stop relying on this 
behavior and list every wpa_supplicant option explicitly, or drop the 
BR2_PACKAGE_WPA_SUPPLICANT_CTRL_IFACE option.

  reply	other threads:[~2021-03-16 10:02 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-16  2:18 [Buildroot] [PATCH 1/1] package/wpa_supplicant: fix WPA_SUPPLICANT_CONFIGURE_CMDS Tian Yuanhao
2021-03-16 10:02 ` Nicolas Cavallari [this message]
2021-03-17  3:37 ` [Buildroot] [PATCH v2 1/1] package/wpa_supplicant: fix wrong config Tian Yuanhao
2021-04-01  1:43   ` Tian Yuanhao
2021-04-02  9:08     ` Nicolas Cavallari
2021-04-03  2:23   ` [Buildroot] [PATCH v3 1/1] package/wpa_supplicant: handle CONFIG_CTRL_IFACE carefully Tian Yuanhao
2021-04-03  7:01     ` Yann E. MORIN
2021-04-03  7:49       ` Tian Yuanhao
2021-04-06 20:10         ` Arnout Vandecappelle
2021-04-07  7:22           ` Peter Korsgaard
2021-04-07  7:32             ` Arnout Vandecappelle
2021-04-07  8:44               ` Peter Korsgaard
2021-04-07 21:47           ` Yann E. MORIN

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=9d4e31b1-2b0b-b9e8-662f-ad4d64b083e3@green-communications.fr \
    --to=nicolas.cavallari@green-communications.fr \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.