From patchwork Fri Oct 29 05:43:11 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Steven Rostedt <rostedt@goodmis.org>
X-Patchwork-Id: 289352
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9T5jF1a012992
	for <patchwork-kbuild@patchwork.kernel.org>;
	Fri, 29 Oct 2010 05:45:15 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753267Ab0J2Fon (ORCPT
	<rfc822;patchwork-kbuild@patchwork.kernel.org>);
	Fri, 29 Oct 2010 01:44:43 -0400
Received: from hrndva-omtalb.mail.rr.com ([71.74.56.125]:63327 "EHLO
	hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by
	vger.kernel.org with ESMTP id S1752265Ab0J2Fo0 (ORCPT
	<rfc822;linux-kbuild@vger.kernel.org>);
	Fri, 29 Oct 2010 01:44:26 -0400
X-Authority-Analysis: v=1.1 cv=kXGwZUU/u1JTMRv8Axk4W0omja+vfTT+sGlOkodD8F8=
	c=1 sm=0 a=Om30yJlIVGMA:10 a=bbbx4UPp9XUA:10
	a=OPBmh+XkhLl+Enan7BmTLg==:17 a=20KFwNOVAAAA:8
	a=pGLkceISAAAA:8 a=7gkXJVJtAAAA:8 a=meVymXHHAAAA:8
	a=4e1kaW1goDNjlzB9y6UA:9 a=TKUsUahZHlEAVB9ByHG3nr12rBwA:4
	a=hXFNqW0bEOwA:10 a=jEp0ucaQiEUA:10 a=MSl-tDqOz04A:10
	a=JmBWkid0h3cA:10 a=jeBq3FmKZ4MA:10
	a=OPBmh+XkhLl+Enan7BmTLg==:117
X-Cloudmark-Score: 0
X-Originating-IP: 67.242.120.143
Received: from [67.242.120.143] ([67.242.120.143:46386]
	helo=gandalf.stny.rr.com)
	by hrndva-oedge02.mail.rr.com (envelope-from <rostedt@goodmis.org>)
	(ecelerity 2.2.3.46 r()) with ESMTP
	id E8/50-14897-83F5ACC4; Fri, 29 Oct 2010 05:44:25 +0000
Received: from rostedt by gandalf.stny.rr.com with local (Exim 4.72)
	(envelope-from <rostedt@goodmis.org>)
	id 1PBhlH-0004uK-LI; Fri, 29 Oct 2010 01:44:23 -0400
Message-Id: <20101029054423.498608001@goodmis.org>
User-Agent: quilt/0.48-1
Date: Fri, 29 Oct 2010 01:43:11 -0400
From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Michal Marek <mmarek@suse.cz>, linux-kbuild@vger.kernel.org,
	Arnaud Lacombe <lacombar@gmail.com>, Sam Ravnborg <sam@ravnborg.org>
Subject: [PATCH 1/5] [PATCH 1/5] kconfig: Make localmodconfig handle
	environment variables
References: <20101029054310.790179545@goodmis.org>
Content-Disposition: inline;
	filename=0001-kconfig-Make-localmodconfig-handle-environment-varia.patch
Sender: linux-kbuild-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kbuild.vger.kernel.org>
X-Mailing-List: linux-kbuild@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Fri, 29 Oct 2010 05:45:15 +0000 (UTC)


diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index c70a27d..cc10bcf 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -137,7 +137,17 @@ sub read_kconfig {
     my $config;
     my @kconfigs;
 
-    open(KIN, "$ksource/$kconfig") || die "Can't open $kconfig";
+    my $source = "$ksource/$kconfig";
+    my $last_source = "";
+
+    # Check for any environment variables used
+    while ($source =~ /\$(\w+)/ && $last_source ne $source) {
+	my $env = $1;
+	$last_source = $source;
+	$source =~ s/\$$env/$ENV{$env}/;
+    }
+
+    open(KIN, "$source") || die "Can't open $kconfig";
     while (<KIN>) {
 	chomp;