From: Benjamin Poirier <bpoirier@suse.com>
Date: Mon, 11 Apr 2016 00:06:30 +0000 (-0700)
Subject: localmodconfig: Recognize more keywords that end a menu entry
X-Git-Tag: v4.7-rc1~120^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=27b7156886d875f2f54fab8790144e1fa80b7160;p=karo-tx-linux.git

localmodconfig: Recognize more keywords that end a menu entry

Based on the list in Documentation/kbuild/kconfig-language.txt

This removes junk from %depends because parsing of a menu entry spilled
over to another menu entry.

Link: http://lkml.kernel.org/r/1460333193-16361-1-git-send-email-bpoirier@suse.com

Signed-off-by: Benjamin Poirier <bpoirier@suse.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---

diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index 7036ae306db6..64d750cc5ae4 100755
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -256,8 +256,8 @@ sub read_kconfig {
 
 	    $iflevel-- if ($iflevel);
 
-	# stop on "help"
-	} elsif (/^\s*help\s*$/) {
+	# stop on "help" and keywords that end a menu entry
+	} elsif (/^\s*help\s*$/ || /^(comment|choice|menu)\b/) {
 	    $state = "NONE";
 	}
     }