lkml.org 
[lkml]   [2009]   [Nov]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 2/4] kconfig: streamline_config.pl: fix out-of-tree builds
On Fri, Nov 20, 2009 at 07:50:52AM -0800, Alan Jenkins wrote:
> We should look for Kconfig under $srctree, just like zconf.l does.
> This allows "make localmodconfig" to work when using a separate build
> directory (e.g. make O=../build).
>
> Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
> ---
> scripts/kconfig/streamline_config.pl | 10 +++++++---
> 1 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
> index 7d898e3..7a7bcf7 100644
> --- a/scripts/kconfig/streamline_config.pl
> +++ b/scripts/kconfig/streamline_config.pl
> @@ -46,7 +46,7 @@ use warnings;
> # make oldconfig
> #
> my $config = ".config";
> -my $linuxpath = ".";
> +my $srctree = $ENV{"srctree"} || ".";
>
> my $uname = `uname -r`;
> chomp $uname;
> @@ -114,7 +114,7 @@ sub find_config {
>
> find_config;
>
> -my @makefiles = `find $linuxpath -name Makefile`;
> +my @makefiles = `find $srctree -name Makefile`;
> my %depends;
> my %selects;
> my %prompts;
> @@ -135,7 +135,11 @@ sub read_kconfig {
> my $config;
> my @kconfigs;
>
> - open(KIN, $kconfig) || die "Can't open $kconfig";
> + open(KIN, $kconfig) || (
> + $kconfig =~ "^[^/]" &&
> + open(KIN, $srctree . "/" . $kconfig)
> + ) || die "Can't open $kconfig";
> +

God I hate perl, can this be a little perl-un-obfuscated a bit?

Luis


\
 
 \ /
  Last update: 2009-11-20 17:49    [W:0.144 / U:0.480 seconds]
©2003-2011 Jasper Spaans