summaryrefslogtreecommitdiffstats
path: root/scripts/kconfig
diff options
context:
space:
mode:
authorBenjamin Poirier <bpoirier@suse.com>2016-04-10 17:06:31 -0700
committerSteven Rostedt <rostedt@goodmis.org>2016-04-26 10:05:01 -0400
commita77ed525d0120e244937eaa74c6086da1dab283a (patch)
tree2299669b28143cb8605e0b8b15a05de73846cb93 /scripts/kconfig
parent27b7156886d875f2f54fab8790144e1fa80b7160 (diff)
downloadlinux-stable-a77ed525d0120e244937eaa74c6086da1dab283a.tar.gz
linux-stable-a77ed525d0120e244937eaa74c6086da1dab283a.tar.bz2
linux-stable-a77ed525d0120e244937eaa74c6086da1dab283a.zip
localmodconfig: Fix parsing of "help" text
Help text may start with "help" or "---help---". This patch fixes read_kconfig() to recognize the second variant. This removes useless junk from %depends and %selects. That junk is due to help text that contains the words "selects" and "depends". Link: http://lkml.kernel.org/r/1460333193-16361-2-git-send-email-bpoirier@suse.com Signed-off-by: Benjamin Poirier <bpoirier@suse.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'scripts/kconfig')
-rwxr-xr-xscripts/kconfig/streamline_config.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index 64d750cc5ae4..b2f904a24c5c 100755
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -257,7 +257,7 @@ sub read_kconfig {
$iflevel-- if ($iflevel);
# stop on "help" and keywords that end a menu entry
- } elsif (/^\s*help\s*$/ || /^(comment|choice|menu)\b/) {
+ } elsif (/^\s*(---)?help(---)?\s*$/ || /^(comment|choice|menu)\b/) {
$state = "NONE";
}
}