From patchwork Thu Apr 30 23:36:44 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 21266 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 n3UNcBTj015731 for ; Thu, 30 Apr 2009 23:38:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751054AbZD3XiD (ORCPT ); Thu, 30 Apr 2009 19:38:03 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754488AbZD3XiB (ORCPT ); Thu, 30 Apr 2009 19:38:01 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.123]:53889 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754465AbZD3XiA (ORCPT ); Thu, 30 Apr 2009 19:38:00 -0400 Received: from gandalf.stny.rr.com ([74.67.89.75]) by hrndva-omta04.mail.rr.com with ESMTP id <20090430233759686.PGJU6415@hrndva-omta04.mail.rr.com>; Thu, 30 Apr 2009 23:37:59 +0000 Received: from rostedt by gandalf.stny.rr.com with local (Exim 4.69) (envelope-from ) id 1LzfpH-0006n0-1i; Thu, 30 Apr 2009 19:37:59 -0400 Message-Id: <20090430233758.444232604@goodmis.org> References: <20090430233642.333097165@goodmis.org> User-Agent: quilt/0.46-1 Date: Thu, 30 Apr 2009 19:36:44 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , Theodore Tso , Arnaldo Carvalho de Melo , zippel@linux-m68k.org, linux-kbuild@vger.kernel.org, Sam Ravnborg , Alan Jenkins Subject: [PATCH 2/2] kconfig: test for /boot/config-uname after /proc/config.gz in localconfig Content-Disposition: inline; filename=0002-kconfig-test-for-boot-config-uname-after-proc-con.patch Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org From: Steven Rostedt Many distros put their config in /boot/config-`uname -r`, add a check for that right after /proc/config.gz [ Impact: use distro config as default to streamline_config.pl ] Reported-by: Alan Jenkins Signed-off-by: Steven Rostedt --- scripts/kconfig/streamline_config.pl | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl index 69b7c3f..46ca62d 100644 --- a/scripts/kconfig/streamline_config.pl +++ b/scripts/kconfig/streamline_config.pl @@ -54,6 +54,10 @@ my @searchconfigs = ( "exec" => "zcat", }, { + "file" => "/boot/config-$uname", + "exec" => "cat", + }, + { "file" => "/boot/vmlinuz-$uname", "exec" => "scripts/extract-ikconfig", "test" => "scripts/extract-ikconfig",