diff mbox series

[v2,2/7] streamline_config.pl: ensure all defaults are tracked

Message ID 20241014141345.5680-3-david.hunter.linux@gmail.com (mailing list archive)
State New
Headers show
Series streamline_config.pl: fix: process configs set to "y" | expand

Commit Message

David Hunter Oct. 14, 2024, 2:13 p.m. UTC
Track default options on the second line. On the second line of some
config entries, default and depndency options sometimes appear. In those
instances, the state will be "NEW" and not "DEP".

Signed-off-by: David Hunter <david.hunter.linux@gmail.com>
---
V1 https://lore.kernel.org/all/20240913171205.22126-4-david.hunter.linux@gmail.com/

V2
	- changed the subject
	- changed the condition to be more in line with the script style 
---
 scripts/kconfig/streamline_config.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Steven Rostedt Oct. 15, 2024, 11:09 p.m. UTC | #1
On Mon, 14 Oct 2024 10:13:32 -0400
David Hunter <david.hunter.linux@gmail.com> wrote:

Hi David,

Thanks for sending these.

> Track default options on the second line. On the second line of some
> config entries, default and depndency options sometimes appear. In those
			      "dependency"

> instances, the state will be "NEW" and not "DEP".

Can you list some examples of where this happens?

Thanks,

-- Steve

> 
> Signed-off-by: David Hunter <david.hunter.linux@gmail.com>
> ---
> V1 https://lore.kernel.org/all/20240913171205.22126-4-david.hunter.linux@gmail.com/
> 
> V2
> 	- changed the subject
> 	- changed the condition to be more in line with the script style 
> ---
>  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 a85d6a3108a1..85f4712e2bf3 100755
> --- a/scripts/kconfig/streamline_config.pl
> +++ b/scripts/kconfig/streamline_config.pl
> @@ -220,7 +220,7 @@ sub read_kconfig {
>  	    $depends{$config} = $1;
>  	} elsif ($state eq "DEP" && /^\s*depends\s+on\s+(.*)$/) {
>  	    $depends{$config} .= " " . $1;
> -	} elsif ($state eq "DEP" && /^\s*def(_(bool|tristate)|ault)\s+(\S.*)$/) {
> +	} elsif ($state ne "NONE" && /^\s*def(_(bool|tristate)|ault)\s+(\S.*)$/) {
>  	    my $dep = $3;
>  	    if ($dep !~ /^\s*(y|m|n)\s*$/) {
>  		$dep =~ s/.*\sif\s+//;
Masahiro Yamada Nov. 5, 2024, 11:05 p.m. UTC | #2
On Wed, Oct 16, 2024 at 8:09 AM Steven Rostedt <rostedt@goodmis.org> wrote:
>
> On Mon, 14 Oct 2024 10:13:32 -0400
> David Hunter <david.hunter.linux@gmail.com> wrote:
>
> Hi David,
>
> Thanks for sending these.
>
> > Track default options on the second line. On the second line of some
> > config entries, default and depndency options sometimes appear. In those
>                               "dependency"
>
> > instances, the state will be "NEW" and not "DEP".
>
> Can you list some examples of where this happens?


As described in the commit log, the def_bool, def_trristate, and default
can appear in the second line.


config FOO
         def_tristate BAR

Then, FOO has dependency on BAR.



> Thanks,
>
> -- Steve
>
> >
> > Signed-off-by: David Hunter <david.hunter.linux@gmail.com>
> > ---
> > V1 https://lore.kernel.org/all/20240913171205.22126-4-david.hunter.linux@gmail.com/
> >
> > V2
> >       - changed the subject
> >       - changed the condition to be more in line with the script style
> > ---
> >  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 a85d6a3108a1..85f4712e2bf3 100755
> > --- a/scripts/kconfig/streamline_config.pl
> > +++ b/scripts/kconfig/streamline_config.pl
> > @@ -220,7 +220,7 @@ sub read_kconfig {
> >           $depends{$config} = $1;
> >       } elsif ($state eq "DEP" && /^\s*depends\s+on\s+(.*)$/) {
> >           $depends{$config} .= " " . $1;
> > -     } elsif ($state eq "DEP" && /^\s*def(_(bool|tristate)|ault)\s+(\S.*)$/) {
> > +     } elsif ($state ne "NONE" && /^\s*def(_(bool|tristate)|ault)\s+(\S.*)$/) {
> >           my $dep = $3;
> >           if ($dep !~ /^\s*(y|m|n)\s*$/) {
> >               $dep =~ s/.*\sif\s+//;
>


--
Best Regards
Masahiro Yamada
Masahiro Yamada Nov. 5, 2024, 11:05 p.m. UTC | #3
On Mon, Oct 14, 2024 at 11:14 PM David Hunter
<david.hunter.linux@gmail.com> wrote:
>
> Track default options on the second line. On the second line of some
> config entries, default and depndency options sometimes appear. In those
> instances, the state will be "NEW" and not "DEP".
>
> Signed-off-by: David Hunter <david.hunter.linux@gmail.com>
> ---
> V1 https://lore.kernel.org/all/20240913171205.22126-4-david.hunter.linux@gmail.com/
>
> V2
>         - changed the subject
>         - changed the condition to be more in line with the script style
> ---

Applied to kbuild with the typo fixed.
Thanks.



>  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 a85d6a3108a1..85f4712e2bf3 100755
> --- a/scripts/kconfig/streamline_config.pl
> +++ b/scripts/kconfig/streamline_config.pl
> @@ -220,7 +220,7 @@ sub read_kconfig {
>             $depends{$config} = $1;
>         } elsif ($state eq "DEP" && /^\s*depends\s+on\s+(.*)$/) {
>             $depends{$config} .= " " . $1;
> -       } elsif ($state eq "DEP" && /^\s*def(_(bool|tristate)|ault)\s+(\S.*)$/) {
> +       } elsif ($state ne "NONE" && /^\s*def(_(bool|tristate)|ault)\s+(\S.*)$/) {
>             my $dep = $3;
>             if ($dep !~ /^\s*(y|m|n)\s*$/) {
>                 $dep =~ s/.*\sif\s+//;
> --
> 2.43.0
>

--
Best Regards
Masahiro Yamada
diff mbox series

Patch

diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index a85d6a3108a1..85f4712e2bf3 100755
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -220,7 +220,7 @@  sub read_kconfig {
 	    $depends{$config} = $1;
 	} elsif ($state eq "DEP" && /^\s*depends\s+on\s+(.*)$/) {
 	    $depends{$config} .= " " . $1;
-	} elsif ($state eq "DEP" && /^\s*def(_(bool|tristate)|ault)\s+(\S.*)$/) {
+	} elsif ($state ne "NONE" && /^\s*def(_(bool|tristate)|ault)\s+(\S.*)$/) {
 	    my $dep = $3;
 	    if ($dep !~ /^\s*(y|m|n)\s*$/) {
 		$dep =~ s/.*\sif\s+//;