From patchwork Mon Oct 1 16:42:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 1531911 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 57F2D3FE80 for ; Mon, 1 Oct 2012 16:42:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753535Ab2JAQmb (ORCPT ); Mon, 1 Oct 2012 12:42:31 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:31958 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753328Ab2JAQma (ORCPT ); Mon, 1 Oct 2012 12:42:30 -0400 X-Authority-Analysis: v=2.0 cv=Hsb06jvS c=1 sm=0 a=rXTBtCOcEpjy1lPqhTCpEQ==:17 a=mNMOxpOpBa8A:10 a=oYxC0fd_ZEgA:10 a=5SG0PmZfjMsA:10 a=meVymXHHAAAA:8 a=C3BgsOTBTHQA:10 a=VwQbUJbxAAAA:8 a=pGLkceISAAAA:8 a=6m4_6qrbAAAA:8 a=BUBKTOufj5_26cyAmdgA:9 a=PUjeQqilurYA:10 a=MSl-tDqOz04A:10 a=1EMWAQIQJ69d_K0ieRoA:9 a=rXTBtCOcEpjy1lPqhTCpEQ==:117 X-Cloudmark-Score: 0 X-Originating-IP: 74.67.115.198 Received: from [74.67.115.198] ([74.67.115.198:51258] helo=[192.168.23.10]) by hrndva-oedge02.mail.rr.com (envelope-from ) (ecelerity 2.2.3.46 r()) with ESMTP id 9A/AE-01602-4F7C9605; Mon, 01 Oct 2012 16:42:29 +0000 Message-ID: <1349109745.22822.118.camel@gandalf.local.home> Subject: [PATCH][GIT PULL] localmodconfig: last minute fix From: Steven Rostedt To: LKML Cc: Linus Torvalds , Yuta Ando , stable , linux-kbuild Date: Mon, 01 Oct 2012 12:42:25 -0400 X-Mailer: Evolution 3.4.3-1 Mime-Version: 1.0 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org 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@vger.kernel.org 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 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@gmail.com Cc: stable@vger.kernel.org # v3.2 Cc: linux-kbuild@vger.kernel.org Signed-off-by: Yuta Ando Signed-off-by: Steven Rostedt 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; }