[Pkg-lustre-svn-commit] updated: [fc42004] Fix oot-builds with 1.8.7 - the META file was generated in a checkout of the 1.8.7_wc1 tag

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit fc42004f191361a00a463431d6da129da0d31f51
Author: Patrick Winnertz <winnie at debian.org>
Date:   Fri Dec 2 13:57:28 2011 +0100

    Fix oot-builds with 1.8.7 - the META file was generated in a checkout of the 1.8.7_wc1 tag
    
    Signed-off-by: Patrick Winnertz <winnie at debian.org>

diff --git a/debian/patches/fix-oot-builds.patch b/debian/patches/fix-oot-builds.patch
index 63a9ef4..e9e18cc 100644
--- a/debian/patches/fix-oot-builds.patch
+++ b/debian/patches/fix-oot-builds.patch
@@ -4,8 +4,8 @@
 
 Index: lustre/build/autoconf/lustre-build.m4
 ===================================================================
---- lustre.orig/build/autoconf/lustre-build.m4	2011-11-16 14:47:46.916997055 +0100
-+++ lustre/build/autoconf/lustre-build.m4	2011-11-16 15:16:57.297676717 +0100
+--- lustre.orig/build/autoconf/lustre-build.m4	2011-12-02 13:55:25.637462571 +0100
++++ lustre/build/autoconf/lustre-build.m4	2011-12-02 13:56:45.649859332 +0100
 @@ -864,7 +864,7 @@
  	CC="$CC -m64"
  fi
@@ -17,8 +17,8 @@ Index: lustre/build/autoconf/lustre-build.m4
  AC_SUBST(LLCPPFLAGS)
 Index: lustre/lustre/autoMakefile.am
 ===================================================================
---- lustre.orig/lustre/autoMakefile.am	2011-11-16 14:47:46.924997088 +0100
-+++ lustre/lustre/autoMakefile.am	2011-11-16 15:16:57.297676717 +0100
+--- lustre.orig/lustre/autoMakefile.am	2011-12-02 13:55:25.637462571 +0100
++++ lustre/lustre/autoMakefile.am	2011-12-02 13:56:45.649859332 +0100
 @@ -85,7 +85,7 @@
  BUILD_VER_H=$(top_builddir)/lustre/include/lustre/lustre_build_version.h
  
@@ -30,9 +30,20 @@ Index: lustre/lustre/autoMakefile.am
                  $(RM) tmpver tmpdiff ||					\
 Index: lustre/lustre/scripts/version_tag.pl
 ===================================================================
---- lustre.orig/lustre/scripts/version_tag.pl	2011-11-16 14:47:46.936997153 +0100
-+++ lustre/lustre/scripts/version_tag.pl	2011-11-16 15:32:18.422244336 +0100
-@@ -47,17 +47,19 @@
+--- lustre.orig/lustre/scripts/version_tag.pl	2011-12-02 13:55:25.645462592 +0100
++++ lustre/lustre/scripts/version_tag.pl	2011-12-02 13:57:14.826004007 +0100
+@@ -8,8 +8,9 @@
+ 
+     my $file = new IO::File;
+     my ($line, $dir, $objdir, $modules, $version, $local_version, $buildid);
++    chomp(my $cwd = `pwd`);
+     if (!$file->open("autoMakefile")) {
+-        die "Run ./configure first\n";
++        die "We are $cwd in Run ./configure first\n";
+     }
+     $modules = 1;
+     while (defined($line = <$file>)) {
+@@ -47,17 +48,19 @@
          !$ver->open("$objdir/include/linux/version.h") &&
          !$ver->open("$dir/include/linux/utsrelease.h") &&
          !$ver->open("$dir/include/linux/version.h")) {
@@ -61,21 +72,41 @@ Index: lustre/lustre/scripts/version_tag.pl
      chomp($kernver);
      return $kernver;
  
-@@ -132,7 +134,7 @@
- } else {
-     die("a tree status can only be determined in an source code control system checkout\n")
-         if ($progname eq "make_META.pl");
--    require "version_tag-none.pl";
-+    #require "version_tag-none.pl";
+@@ -118,7 +121,7 @@
+ # ARGV[0] = srcdir
+ # ARGV[1] = builddir
+ 
+-# need to be in srcdir
++# need to be in builddir
+ if ($ARGV[0]) {
+     chdir($ARGV[0]);
+ }
+@@ -135,6 +138,8 @@
+     require "version_tag-none.pl";
  }
  
++chdir($cwd);
++chdir($ARGV[1]);
  ($am_linuxdir, $am_linuxobjdir, $am_modules, $am_version, $local_version,
-@@ -143,6 +145,8 @@
+  $am_buildid) = read_autoMakefile();
+ 
+@@ -143,6 +148,8 @@
  my $buildid = get_buildid();
  
  if ($progname eq "version_tag.pl") {
 +    chdir($cwd);
-+    chdir($ARG[1]);
++    chdir($ARGV[1]);
      my $kernver = "";
      $kernver = get_kernver($am_linuxdir, $am_linuxobjdir)
          if ($am_linuxdir ne "");
+Index: lustre/META
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ lustre/META	2011-12-02 13:57:06.573963089 +0100
+@@ -0,0 +1,6 @@
++TAG = v1_8_7_WC1
++VERSION = 1.8.7
++BUILDID = 
++PRISTINE = 0
++LOCAL_VERSION =
++ 

-- 
Lustre Debian Packaging