From patchwork Fri Sep 11 19:59:02 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 46988 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8BK45iM008614 for ; Fri, 11 Sep 2009 20:04:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756357AbZIKUAs (ORCPT ); Fri, 11 Sep 2009 16:00:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756343AbZIKUAq (ORCPT ); Fri, 11 Sep 2009 16:00:46 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.125]:47699 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756105AbZIKUAd (ORCPT ); Fri, 11 Sep 2009 16:00:33 -0400 Received: from gandalf.stny.rr.com ([74.67.89.75]) by hrndva-omta03.mail.rr.com with ESMTP id <20090911200036691.ZBEX4372@hrndva-omta03.mail.rr.com>; Fri, 11 Sep 2009 20:00:36 +0000 Received: from rostedt by gandalf.stny.rr.com with local (Exim 4.69) (envelope-from ) id 1MmCIO-0005uX-AP; Fri, 11 Sep 2009 16:00:36 -0400 Message-Id: <20090911200036.117261078@goodmis.org> References: <20090911195849.451244684@goodmis.org> User-Agent: quilt/0.46-1 Date: Fri, 11 Sep 2009 15:59:02 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Linus Torvalds , Andrew Morton , Ingo Molnar , Thomas Gleixner , Theodore Tso , Arnaldo Carvalho de Melo , zippel@linux-m68k.org, linux-kbuild@vger.kernel.org, Sam Ravnborg , Dick Streefland , Stephen Rothwell Subject: [PATCH 13/15] kconfig: make local .config default for streamline_config Content-Disposition: inline; filename=0013-kconfig-make-local-.config-default-for-streamline_co.patch Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org From: Steven Rostedt As Andi Kleen pointed out, most people would expect that the local .config file to be based for a streamline config. This patch changes the order of searching for a config file to consider the .config in the local directory first. Reported-by: Andi Kleen Signed-off-by: Steven Rostedt --- scripts/kconfig/streamline_config.pl | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl index 46ca62d..95984db 100644 --- a/scripts/kconfig/streamline_config.pl +++ b/scripts/kconfig/streamline_config.pl @@ -50,6 +50,10 @@ chomp $uname; my @searchconfigs = ( { + "file" => ".config", + "exec" => "cat", + }, + { "file" => "/proc/config.gz", "exec" => "zcat", }, @@ -82,10 +86,6 @@ my @searchconfigs = ( "exec" => "scripts/extract-ikconfig", "test" => "scripts/extract-ikconfig", }, - { - "file" => ".config", - "exec" => "cat", - }, ); sub find_config {