linux-kernel - [PATCH 2/4] kconfig: streamline_config.pl: fix out-of-tree builds

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1258732254-15573-3-git-send-email-alan-jenkins@tuffmail.co.uk>
Date:	Fri, 20 Nov 2009 15:50:52 +0000
From:	Alan Jenkins <alan-jenkins@...fmail.co.uk>
To:	linux-kernel@...r.kernel.org, lrodriguez@...eros.com
Cc:	sam@...nborg.org, greg@...ah.com, akpm@...ux-foundation.org,
	mcgrof@...il.com, Alan Jenkins <alan-jenkins@...fmail.co.uk>
Subject: [PATCH 2/4] kconfig: streamline_config.pl: fix out-of-tree builds

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@...fmail.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";
+
     while (<KIN>) {
 	chomp;
 
-- 
1.6.3.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/