streamline_config.pl: handle also ${CONFIG_FOO}
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!!
--- scripts/kconfig/streamline_config.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/kconfig/streamline_config.pl +1 -1
@@ -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
Quoted 7 lines · Jiri Slaby (SUSE)
From: Jiri Slaby <[email protected]>
streamline_config.pl currently searches for CONFIG options in
Kconfigfiles 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!!Signed-off-by Jiri Slaby <[email protected]>Cc Mika Westerberg <[email protected]>
Quoted 12 lines · Jiri Slaby (SUSE)
From: Jiri Slaby <[email protected]>
streamline_config.pl currently searches for CONFIG options in
Kconfigfiles 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
Signed-off-by Jiri Slaby <[email protected]>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
Steven Rostedt
Acked-byQuoted 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
Kconfigfiles 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
Signed-off-by Jiri Slaby <[email protected]>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