linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Benjamin Poirier <bpoirier@suse.com>
Subject: [for-next][PATCH 2/6] localmodconfig: Recognize more keywords that end a menu entry
Date: Tue, 26 Apr 2016 18:44:12 -0400	[thread overview]
Message-ID: <20160426224442.604106091@goodmis.org> (raw)
In-Reply-To: 20160426224410.186640776@goodmis.org

[-- Attachment #1: 0002-localmodconfig-Recognize-more-keywords-that-end-a-me.patch --]
[-- Type: text/plain, Size: 997 bytes --]

From: Benjamin Poirier <bpoirier@suse.com>

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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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";
 	}
     }
-- 
2.8.0.rc3

  parent reply	other threads:[~2016-04-26 22:44 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-26 22:44 [for-next][PATCH 0/6] localmodconfig: Updates for 4.7 Steven Rostedt
2016-04-26 22:44 ` [for-next][PATCH 1/6] localmodconfig: Fix parsing of Kconfig "source" statements Steven Rostedt
2016-04-26 22:44 ` Steven Rostedt [this message]
2016-04-26 22:44 ` [for-next][PATCH 3/6] localmodconfig: Fix parsing of "help" text Steven Rostedt
2016-04-26 22:44 ` [for-next][PATCH 4/6] localmodconfig: Add missing $ to reference a variable Steven Rostedt
2016-04-26 22:44 ` [for-next][PATCH 5/6] localmodconfig: Reset certificate paths Steven Rostedt
2016-04-26 22:44 ` [for-next][PATCH 6/6] localmodconfig: Fix whitespace repeat count after "tristate" Steven Rostedt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160426224442.604106091@goodmis.org \
    --to=rostedt@goodmis.org \
    --cc=akpm@linux-foundation.org \
    --cc=bpoirier@suse.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).