]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
localmodconfig: Recognize more keywords that end a menu entry
authorBenjamin Poirier <bpoirier@suse.com>
Mon, 11 Apr 2016 00:06:30 +0000 (17:06 -0700)
committerSteven Rostedt <rostedt@goodmis.org>
Tue, 26 Apr 2016 14:04:42 +0000 (10:04 -0400)
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>
scripts/kconfig/streamline_config.pl

index 7036ae306db6d9bc54b20509db9e7497f44e3f62..64d750cc5ae424d0764e852ba03c1624c392c214 100755 (executable)
@@ -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";
        }
     }