[PATCH][GIT PULL] localmodconfig: last minute fix

[Steven Rostedt]

Linus,

I received this fix from Yuta today. Seems that localyesconfig has been
broken since v3.2 due to a change in the make files that calls it.

The change is a two line fix (see below), so I added it on top of my
last pull request and pushed this out with the new tag. This tag
includes the changes of my last pull request that was tagged
localmodconfig-v3.7.

-- Steve

Please pull the latest localmodconfig-v3.7-2 tree, which can be found at:

  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git
localmodconfig-v3.7-2

Head SHA1: d5f25147faf149510d883de1c8749ab76b812b4elinux-kbuild@xxxxxxxxxxxxxxx


Yuta Ando (1):
      localmodconfig: Fix localyesconfig to set to 'y' not 'm'

----
 scripts/kconfig/streamline_config.pl |    2 ++
 1 file changed, 2 insertions(+)
---------------------------
commit 4eae518d4b01b0cbf2f0d8edb5a6f3d6245ee8fb
Author: Yuta Ando <yuta.and@xxxxxxxxx>
Date:   Mon Oct 1 23:24:30 2012 +0900

    localmodconfig: Fix localyesconfig to set to 'y' not 'm'
    
    The kbuild target 'localyesconfig' has been same as 'localmodconfig'
    since the commit 50bce3e "kconfig/streamline_config.pl: merge
    local{mod,yes}config". The commit expects this script generates
    different configure depending on target, but it was not yet implemented.
    
    So I added code that sets to 'yes' when target is 'localyesconfig'.
    
    Link: http://lkml.kernel.org/r/1349101470-12243-1-git-send-email-yuta.and@xxxxxxxxx
    
    Cc: stable@xxxxxxxxxxxxxxx # v3.2
    Cc: linux-kbuild@xxxxxxxxxxxxxxx
    Signed-off-by: Yuta Ando <yuta.and@xxxxxxxxx>
    Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxxxxxxxxxxxx>

diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index 39b6314..3368939 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -601,6 +601,8 @@ foreach my $line (@config_file) {
 	if (defined($configs{$1})) {
 	    if ($localyesconfig) {
 	        $setconfigs{$1} = 'y';
+		print "$1=y\n";
+		next;
 	    } else {
 	        $setconfigs{$1} = $2;
 	    }

Attachment: signature.asc
Description: This is a digitally signed message part