Re: [PATCH 1/2] localmodconfig: Fix parsing of Kconfig "source" statements
From: Benjamin Poirier
Date: Mon Apr 18 2016 - 16:29:23 EST
On 2016/04/10 16:52, Benjamin Poirier wrote:
> On 2016/04/08 14:29, Steven Rostedt wrote:
> > On Sat, 2 Apr 2016 10:55:21 -0700
> > Benjamin Poirier <bpoirier@xxxxxxxx> wrote:
> >
> > > The parameter of Kconfig "source" statements does not need to be quoted.
> > > The current regex causes many kconfig files to be skipped and hence,
> > > dependencies to be missed.
> > >
> > > Also fix the whitespace repeat count.
> > >
> > > Signed-off-by: Benjamin Poirier <bpoirier@xxxxxxxx>
> >
> > Thanks for sending this. I'll apply it. Should this be marked for
> > stable? And if so, how far back?
>
> The first problem dates back to the introduction of streamline_config.pl in
> dcc6024 kconfig: add streamline_config.pl to scripts (v2.6.32-rc1)
> The second problem started with
> 19e91b6 modsign: Allow external signing key to be specified (v4.3-rc1)
>
> However, I'm not sure that adding the patch to stable is warranted. I
> considered this with regards to the problem fixed by patch 1/2.
>
> First, I searched for cases where dependency info that's currently missing
> would lead to lead to symbols being erroneously deactivated but I did not find
> any. Since these cases are not so obvious and are quite rare in general, it's
> possible that I missed one but at this stage the problem is theoretical.
>
> Second, even if there is such a case, I'm not sure that the problem is
> "critical". streamline_config.pl may output an "invalid" config because
> it misses some dependencies but the config will be fixed by the
> invocation of silentoldconfig that comes right after in the
> localmodconfig makefile rule. It might not be the config the user
> wanted, but it will be valid.
>
> However, while looking for such a case, I've noticed a few other issues in
> streamline_config.pl and I'll send more patches shortly.
Hi Steven,
Can you please merge these six patches (2 original + 4 followups)?
Thank you,
-Benjamin
>
> >
> > -- Steve
> >
> > > ---
> > > 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 f3d3fb4..7036ae3 100755
> > > --- a/scripts/kconfig/streamline_config.pl
> > > +++ b/scripts/kconfig/streamline_config.pl
> > > @@ -188,7 +188,7 @@ sub read_kconfig {
> > > $cont = 0;
> > >
> > > # collect any Kconfig sources
> > > - if (/^source\s*"(.*)"/) {
> > > + if (/^source\s+"?([^"]+)/) {
> > > my $kconfig = $1;
> > > # prevent reading twice.
> > > if (!defined($read_kconfigs{$kconfig})) {
> >
> >