提交 9f168079 编写于 作者: L Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig:
  kconfig: Fix make O=<dir> local{mod,yes}config
......@@ -30,7 +30,7 @@ silentoldconfig: $(obj)/conf
$< -s $(Kconfig)
localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
$(Q)perl $< $(Kconfig) > .tmp.config
$(Q)perl $< $(srctree) $(Kconfig) > .tmp.config
$(Q)if [ -f .config ]; then \
cmp -s .tmp.config .config || \
(mv -f .config .config.old.1; \
......@@ -44,7 +44,7 @@ localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
$(Q)rm -f .tmp.config
localyesconfig: $(obj)/streamline_config.pl $(obj)/conf
$(Q)perl $< $(Kconfig) > .tmp.config
$(Q)perl $< $(srctree) $(Kconfig) > .tmp.config
$(Q)sed -i s/=m/=y/ .tmp.config
$(Q)if [ -f .config ]; then \
cmp -s .tmp.config .config || \
......
......@@ -43,7 +43,6 @@
# make oldconfig
#
my $config = ".config";
my $linuxpath = ".";
my $uname = `uname -r`;
chomp $uname;
......@@ -111,7 +110,11 @@ sub find_config {
find_config;
my @makefiles = `find $linuxpath -name Makefile`;
# Get the build source and top level Kconfig file (passed in)
my $ksource = $ARGV[0];
my $kconfig = $ARGV[1];
my @makefiles = `find $ksource -name Makefile`;
my %depends;
my %selects;
my %prompts;
......@@ -119,9 +122,6 @@ my %objects;
my $var;
my $cont = 0;
# Get the top level Kconfig file (passed in)
my $kconfig = $ARGV[0];
# prevent recursion
my %read_kconfigs;
......@@ -132,7 +132,7 @@ sub read_kconfig {
my $config;
my @kconfigs;
open(KIN, $kconfig) || die "Can't open $kconfig";
open(KIN, "$ksource/$kconfig") || die "Can't open $kconfig";
while (<KIN>) {
chomp;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册