* [PATCH] streamline_config.pl: handle also ${CONFIG_FOO}
@ 2023-06-07 6:14 Jiri Slaby (SUSE)
2023-06-07 6:47 ` Mika Westerberg
2023-06-07 12:22 ` Masahiro Yamada
0 siblings, 2 replies; 4+ messages in thread
From: Jiri Slaby (SUSE) @ 2023-06-07 6:14 UTC (permalink / raw)
To: masahiroy
Cc: linux-kernel, Jiri Slaby, andreas.noever, michael.jamet,
Mika Westerberg, YehezkelShB, Steven Rostedt,
Linux Kbuild mailing list
From: Jiri Slaby <jslaby@suse.cz>
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!!
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: andreas.noever@gmail.com
Cc: michael.jamet@intel.com
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: YehezkelShB@gmail.com
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Linux Kbuild mailing list <linux-kbuild@vger.kernel.org>
---
scripts/kconfig/streamline_config.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index 3387ad7508f7..d51cd7ac15d2 100755
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -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;
--
2.41.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] streamline_config.pl: handle also ${CONFIG_FOO}
2023-06-07 6:14 [PATCH] streamline_config.pl: handle also ${CONFIG_FOO} Jiri Slaby (SUSE)
@ 2023-06-07 6:47 ` Mika Westerberg
2023-06-07 12:22 ` Masahiro Yamada
1 sibling, 0 replies; 4+ messages in thread
From: Mika Westerberg @ 2023-06-07 6:47 UTC (permalink / raw)
To: Jiri Slaby (SUSE)
Cc: masahiroy, linux-kernel, Jiri Slaby, andreas.noever,
michael.jamet, YehezkelShB, Steven Rostedt,
Linux Kbuild mailing list
On Wed, Jun 07, 2023 at 08:14:17AM +0200, Jiri Slaby (SUSE) wrote:
> From: Jiri Slaby <jslaby@suse.cz>
>
> 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!!
>
> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> Cc: andreas.noever@gmail.com
> Cc: michael.jamet@intel.com
> Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] streamline_config.pl: handle also ${CONFIG_FOO}
2023-06-07 6:14 [PATCH] streamline_config.pl: handle also ${CONFIG_FOO} Jiri Slaby (SUSE)
2023-06-07 6:47 ` Mika Westerberg
@ 2023-06-07 12:22 ` Masahiro Yamada
2023-06-07 14:49 ` Steven Rostedt
1 sibling, 1 reply; 4+ messages in thread
From: Masahiro Yamada @ 2023-06-07 12:22 UTC (permalink / raw)
To: Jiri Slaby (SUSE)
Cc: linux-kernel, Jiri Slaby, andreas.noever, michael.jamet,
Mika Westerberg, YehezkelShB, Steven Rostedt,
Linux Kbuild mailing list
On Wed, Jun 7, 2023 at 3:14 PM Jiri Slaby (SUSE) <jirislaby@kernel.org> wrote:
>
> From: Jiri Slaby <jslaby@suse.cz>
>
> 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!!
>
> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> Cc: andreas.noever@gmail.com
> Cc: michael.jamet@intel.com
> Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
> Cc: YehezkelShB@gmail.com
> Cc: Steven Rostedt <rostedt@goodmis.org>
> Cc: Linux Kbuild mailing list <linux-kbuild@vger.kernel.org>
> ---
Applied to linux-kbuild.
Thanks.
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] streamline_config.pl: handle also ${CONFIG_FOO}
2023-06-07 12:22 ` Masahiro Yamada
@ 2023-06-07 14:49 ` Steven Rostedt
0 siblings, 0 replies; 4+ messages in thread
From: Steven Rostedt @ 2023-06-07 14:49 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Jiri Slaby (SUSE), linux-kernel, Jiri Slaby, andreas.noever,
michael.jamet, Mika Westerberg, YehezkelShB,
Linux Kbuild mailing list
On Wed, 7 Jun 2023 21:22:47 +0900
Masahiro Yamada <masahiroy@kernel.org> wrote:
> On Wed, Jun 7, 2023 at 3:14 PM Jiri Slaby (SUSE) <jirislaby@kernel.org> wrote:
> >
> > From: Jiri Slaby <jslaby@suse.cz>
> >
> > 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!!
> >
> > Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> > Cc: andreas.noever@gmail.com
> > Cc: michael.jamet@intel.com
> > Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
> > Cc: YehezkelShB@gmail.com
> > Cc: Steven Rostedt <rostedt@goodmis.org>
> > Cc: Linux Kbuild mailing list <linux-kbuild@vger.kernel.org>
> > ---
I believe I acked this change back here:
https://lore.kernel.org/all/20230513192821.34ca93fd@rorschach.local.home/
But again:
Acked-by: Steven Rostedt (Google) <rostedt@goodmis.org>
-- Steve
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-06-07 14:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-07 6:14 [PATCH] streamline_config.pl: handle also ${CONFIG_FOO} Jiri Slaby (SUSE)
2023-06-07 6:47 ` Mika Westerberg
2023-06-07 12:22 ` Masahiro Yamada
2023-06-07 14:49 ` Steven Rostedt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox