Skip to contentSkip to conversation

streamline_config.pl: handle also ${CONFIG_FOO}

PATCH In review Jiri Slaby (SUSE) 4 participants 4 messages Jun 7, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 streamline_config.pl: handle also ${CONFIG_FOO}

From: Jiri Slaby <[email protected]>

streamline_config.pl currently searches for CONFIG options in Kconfig files as $(CONFIG_FOO). But some Kconfigs (e.g. thunderbolt) use ${CONFIG_FOO}. So fix up the regex to accept both.

This fixes:

$ make LSMOD=`pwd/`/lsmod localmodconfig
using config: '.config'
thunderbolt config not found!!
Cc Mika Westerberg <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc Linux Kbuild mailing list <[email protected]>
---
 scripts/kconfig/streamline_config.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/kconfig/streamline_config.pl +1 -1
index 3387ad7508f7..d51cd7ac15d2 100755
@@ -317,7 +317,7 @@ foreach my $makefile (@makefiles) {
 	$_ = convert_vars($_, %make_vars);
 
 	# collect objects after obj-$(CONFIG_FOO_BAR)
-	if (/obj-\$\((CONFIG_[^\)]*)\)\s*[+:]?=\s*(.*)/) {
+	if (/obj-\$[({](CONFIG_[^})]*)[)}]\s*[+:]?=\s*(.*)/) {
 	    $var = $1;
 	    $objs = $2;
 
Signature · 1 line
2.41.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Jiri Slaby (SUSE)

From: Jiri Slaby <[email protected]>

streamline_config.pl currently searches for CONFIG options in Kconfig files as $(CONFIG_FOO). But some Kconfigs (e.g. thunderbolt) use ${CONFIG_FOO}. So fix up the regex to accept both.

This fixes:

Quoted 8 lines
$ make LSMOD=`pwd/`/lsmod localmodconfig
using config: '.config'
thunderbolt config not found!!
#2 lore raw
In reply to Jiri Slaby (SUSE)
Quoted 12 lines · Jiri Slaby (SUSE)

From: Jiri Slaby <[email protected]>

streamline_config.pl currently searches for CONFIG options in Kconfig files as $(CONFIG_FOO). But some Kconfigs (e.g. thunderbolt) use ${CONFIG_FOO}. So fix up the regex to accept both.

This fixes:

$ make LSMOD=`pwd/`/lsmod localmodconfig
using config: '.config'
thunderbolt config not found!!
Quoted 8 lines
Cc Mika Westerberg <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc Linux Kbuild mailing list <[email protected]>

---

Applied to linux-kbuild.
Thanks.

Signature · 2 lines
Best Regards
Masahiro Yamada
#3 lore raw
Quoted 13 lines · On Wed, 7 Jun 2023 21:22:47 +0900 Masahiro Yamada <[email protected]> wrote:
Quoted 12 lines · Jiri Slaby (SUSE)

From: Jiri Slaby <[email protected]>

streamline_config.pl currently searches for CONFIG options in Kconfig files as $(CONFIG_FOO). But some Kconfigs (e.g. thunderbolt) use ${CONFIG_FOO}. So fix up the regex to accept both.

This fixes:

$ make LSMOD=`pwd/`/lsmod localmodconfig
using config: '.config'
thunderbolt config not found!!
Quoted 8 lines
Quoted 8 lines
Cc Mika Westerberg <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc Linux Kbuild mailing list <[email protected]>

---

I believe I acked this change back here:

https://lore.kernel.org/all/[email protected]/

But again:

-- Steve