From 9ece920bc1e8c391ea3d86ac7bbba949c9804cc0 Mon Sep 17 00:00:00 2001 From: brian Date: Thu, 12 Nov 2009 21:35:47 +0000 Subject: [PATCH] b=19721 i=brian o=adilger Workaround in version_tag.pl for some (Debian?) systems where, for whatever reason, MODULES_{TRUE|FALSE} does not get included in the {auto,}Makefile.in files --- lustre/scripts/version_tag.pl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lustre/scripts/version_tag.pl b/lustre/scripts/version_tag.pl index 31978cf..92655e1 100644 --- a/lustre/scripts/version_tag.pl +++ b/lustre/scripts/version_tag.pl @@ -154,11 +154,10 @@ sub get_linuxdir() $dir = $1; } elsif ($line =~ /LINUX_OBJ :?= (.*)/) { $objdir = $1; - } elsif ($line =~ /MODULES_TRUE :?= (.*)/) { + } elsif ($line =~ /MODULES_TRUE = #/ || + $line =~ /MODULE_TARGET = $/) { # nothing to do if modules are not being built return "" - if ($1 eq "#"); - last; } } $config->close(); @@ -167,7 +166,7 @@ sub get_linuxdir() !$ver->open("$objdir/include/linux/version.h") && !$ver->open("$dir/include/linux/utsrelease.h") && !$ver->open("$dir/include/linux/version.h")) { - die "Run make dep on $dir\n"; + die "Run make dep on '$dir'\n"; } while(defined($line = <$ver>)) { -- 1.8.3.1