aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/kconfig
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2010-10-29 00:56:46 -0400
committerSteven Rostedt <rostedt@goodmis.org>2010-10-29 01:03:42 -0400
commit4908980b241bc639b71ef47b727b4bc7c0174afe (patch)
tree2a45a8d05f0f8da917bcf783a0fbbd747828d467 /scripts/kconfig
parent18cb657ca1bafe635f368346a1676fb04c512edf (diff)
kconfig: Make localmodconfig handle environment variables
The commit 838a2e55e6a4e9e8a10451ed2ef0f7a08dabdb04 kbuild: migrate all arch to the kconfig mainmenu upgrade Broke make localmodconfig. The reason was that it added a environment variable to the kconfig source, which the streamline_config.pl could not handle. This patch changes streamline_config.pl to handle kconfig sources using environment variables in their names. Cc: Arnaud Lacombe <lacombar@gmail.com> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Michal Marek <mmarek@suse.cz> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'scripts/kconfig')
-rw-r--r--scripts/kconfig/streamline_config.pl12
1 files changed, 11 insertions, 1 deletions
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index c70a27d924f0..cc10bcfda64f 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -137,7 +137,17 @@ sub read_kconfig {
137 my $config; 137 my $config;
138 my @kconfigs; 138 my @kconfigs;
139 139
140 open(KIN, "$ksource/$kconfig") || die "Can't open $kconfig"; 140 my $source = "$ksource/$kconfig";
141 my $last_source = "";
142
143 # Check for any environment variables used
144 while ($source =~ /\$(\w+)/ && $last_source ne $source) {
145 my $env = $1;
146 $last_source = $source;
147 $source =~ s/\$$env/$ENV{$env}/;
148 }
149
150 open(KIN, "$source") || die "Can't open $kconfig";
141 while (<KIN>) { 151 while (<KIN>) {
142 chomp; 152 chomp;
143 153