From: David Hunter <david.hunter.linux@gmail.com>
Date: Mon, 14 Oct 2024 14:13:32 +0000 (-0400)
Subject: streamline_config.pl: ensure all defaults are tracked
X-Git-Tag: v6.13-rc1~16^2~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90edd30b8696833a995ab6196a6bee70fb9fcf2c;p=thirdparty%2Fkernel%2Flinux.git

streamline_config.pl: ensure all defaults are tracked

Track default options on the second line. On the second line of some
config entries, default and dependency options sometimes appear. In those
instances, the state will be "NEW" and not "DEP".

Signed-off-by: David Hunter <david.hunter.linux@gmail.com>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index a85d6a3108a1c..85f4712e2bf32 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+//;