]> Git Repo - linux.git/commitdiff
kconfig: fix localmodconfig
authorSam Ravnborg <[email protected]>
Fri, 8 Jun 2018 21:48:31 +0000 (23:48 +0200)
committerMasahiro Yamada <[email protected]>
Mon, 11 Jun 2018 00:16:30 +0000 (09:16 +0900)
When kconfig syntax moved to use $(FOO) for environment variables
localmodconfig was not updated.
Fix so it now works with the new syntax $(FOO)

Fixes: 104daea149c4 ("kconfig: reference environment variables directly and remove 'option env='")
Reported-by: Kevin Locke <[email protected]>
Reported-by: Andrei Vagin <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Tested-by: Kevin Locke <[email protected]>
Signed-off-by: Masahiro Yamada <[email protected]>
scripts/kconfig/streamline_config.pl

index a2e83ab17de3cc2c4c5a15f06b8c0f0eecc4ed99..4686531e2f8ce6fe88c375917724fb076bc8679e 100755 (executable)
@@ -165,10 +165,10 @@ sub read_kconfig {
     my $last_source = "";
 
     # Check for any environment variables used
-    while ($source =~ /\$(\w+)/ && $last_source ne $source) {
+    while ($source =~ /\$\((\w+)\)/ && $last_source ne $source) {
        my $env = $1;
        $last_source = $source;
-       $source =~ s/\$$env/$ENV{$env}/;
+       $source =~ s/\$\($env\)/$ENV{$env}/;
     }
 
     open(my $kinfile, '<', $source) || die "Can't open $kconfig";
This page took 0.054223 seconds and 4 git commands to generate.