[PATCH 1/1] wpa-supplicant: fix sed expression

[PATCH 1/1] wpa-supplicant: fix sed expression

[Vishal Gupta]

From: Vishal Gupta <vishal.gupta_1@philips.com>

The current expression does not remove CONFIG_TLS
because the line begins with '#'. Updated the
expression to make the leading '#' optional so
that CONFIG_TLS is deleted whether or not the
line starts with '#'.

Signed-off-by: Vishal Gupta <vishal.gupta_1@philips.com>
---
 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.11.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.11.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.11.bb
index 6ba10a8ca9..e2a522dd85 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.11.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.11.bb
@@ -37,7 +37,7 @@ 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
-- 
2.43.0

Re: [OE-core] [PATCH 1/1] wpa-supplicant: fix sed expression

[Alexander Kanavin]

On Fri, 19 Dec 2025 at 14:18, Vishal Gupta via lists.openembedded.org
<vishal.gupta_1=bbl.philips.com@lists.openembedded.org> wrote:
> The current expression does not remove CONFIG_TLS
> because the line begins with '#'. Updated the
> expression to make the leading '#' optional so
> that CONFIG_TLS is deleted whether or not the
> line starts with '#'.

But if the line starts with then it's perhaps unneeded to remove it as
its only a comment? What is the use case for doing it?

Alex

Re: [PATCH 1/1] wpa-supplicant: fix sed expression

[vishal.gupta_1]

[-- Attachment #1: Type: text/plain, Size: 1089 bytes --]

Hi Alexander,

In the do_configure function current intention of implementation is to first delete it when we copying and then depending on the PACKAGECONFIG assign it with correct value.
As delete is failed because the line start with "#" we will have two CONFIG_TLS value in final ".config" file

one, at some where middle of the file
#CONFIG_TLS=openssl

second, depending on package config, at the end of file as it's an append operation.
CONFIG_TLS=openssl / gnutls

do_configure () {
${MAKE} -C wpa_supplicant clean
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

So with this change there will be only one "CONFIG_TLS=<value>" option.

[-- Attachment #2: Type: text/html, Size: 25810 bytes --]

Re: [OE-core] [PATCH 1/1] wpa-supplicant: fix sed expression

[Paul Barker]

[-- Attachment #1: Type: text/plain, Size: 1615 bytes --]

On Fri, 2025-12-19 at 05:56 -0800, vishal.gupta_1 via
lists.openembedded.org wrote:
> Hi Alexander,
> 
> In the do_configure function current intention of implementation is to first delete it when we copying and then depending on the PACKAGECONFIG assign it with correct value.
> As delete is failed because the line start with "#" we will have two CONFIG_TLS value in final ".config" file
> 
> one, at some where middle of the file
> #CONFIG_TLS=openssl
> 
> second, depending on package config, at the end of file as it's an append operation.
> CONFIG_TLS=openssl / gnutls
> 
> do_configure () {
> ${MAKE} -C wpa_supplicant clean
> 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
> 
> So with this change there will be only one "CONFIG_TLS=<value>" option.

Looking at the wpa_supplicant README file [1]:

  Configuration options are text lines using following
  format: CONFIG_<option>=y. Lines starting with # are considered
  comments and are ignored.

[1]: https://git.w1.fi/cgit/hostap/tree/wpa_supplicant/README

So, leaving the comment line with the default CONFIG_TLS value isn't a
problem.

Best regards,

-- 
Paul Barker


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 252 bytes --]

Re: [PATCH 1/1] wpa-supplicant: fix sed expression

[vishal.gupta_1]

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

Hi,

Yes, i agree its not a functional issue for wpa_supplicant as this line will be treated as comment.
But this patch is just fixing the sed expression which is intended to delete this line.  :)

Regards
Vishal Gupta

[-- Attachment #2: Type: text/html, Size: 272 bytes --]