[Pkg-lustre-svn-commit] updated: [65422a6] Fix some patches to apply to the newest upstream release of 1.8

Patrick Winnertz winnie at debian.org
Fri Dec 2 13:08:12 UTC 2011 

The following commit has been merged in the master branch:
commit 65422a642636c2e91e646b8b7dffc7d5e2d024fb
Author: Patrick Winnertz <winnie at debian.org>
Date:   Wed Nov 16 14:13:30 2011 +0100

    Fix some patches to apply to the newest upstream release of 1.8
    
    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 e6e24a6..62fd7d8 100644
--- a/debian/patches/fix-oot-builds.patch
+++ b/debian/patches/fix-oot-builds.patch
@@ -4,9 +4,9 @@
 
 Index: lustre/build/autoconf/lustre-build.m4
 ===================================================================
---- lustre.orig/build/autoconf/lustre-build.m4	2010-12-07 16:54:32.365545003 +0100
-+++ lustre/build/autoconf/lustre-build.m4	2010-12-07 17:00:45.137545002 +0100
-@@ -737,7 +737,7 @@
+--- lustre.orig/build/autoconf/lustre-build.m4	2011-11-16 13:56:06.000000000 +0100
++++ lustre/build/autoconf/lustre-build.m4	2011-11-16 14:05:34.568439809 +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	2010-12-07 16:54:32.369545003 +0100
-+++ lustre/lustre/autoMakefile.am	2010-12-07 17:00:45.137545002 +0100
+--- lustre.orig/lustre/autoMakefile.am	2011-11-16 13:56:07.000000000 +0100
++++ lustre/lustre/autoMakefile.am	2011-11-16 14:05:34.568439809 +0100
 @@ -85,7 +85,7 @@
  BUILD_VER_H=$(top_builddir)/lustre/include/lustre/lustre_build_version.h
  
@@ -30,45 +30,43 @@ Index: lustre/lustre/autoMakefile.am
                  $(RM) tmpver tmpdiff ||					\
 Index: lustre/lustre/scripts/version_tag.pl
 ===================================================================
---- lustre.orig/lustre/scripts/version_tag.pl	2010-12-07 16:54:32.385545003 +0100
-+++ lustre/lustre/scripts/version_tag.pl	2010-12-07 17:00:45.137545002 +0100
-@@ -166,17 +166,19 @@
+--- lustre.orig/lustre/scripts/version_tag.pl	2011-11-16 13:56:07.000000000 +0100
++++ lustre/lustre/scripts/version_tag.pl	2011-11-16 14:10:27.209890939 +0100
+@@ -47,17 +47,19 @@
          !$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";
++	$kernver= "UNKOWN-KERNEL";
++    } else {
+ 
 -    while(defined($line = <$ver>)) {
 -        $line =~ /\#define UTS_RELEASE "(.*)"/;
 -        if ($1) {
 -            $kernver = $1;
 -            last;
 -        }
--    }
++    	while(defined($line = <$ver>)) {
++        	$line =~ /\#define UTS_RELEASE "(.*)"/;
++        	if ($1) {
++            		$kernver = $1;
++            		last;
++        	}
++    	}
++    	$ver->close();
+     }
 -    $ver->close();
-+            #die "Run make dep on '$dir'\n";
-+	    $kernver = "UNKOWN-KERNEL";
-+        } else {
-+
-+	    while(defined($line = <$ver>)) {
-+    		$line =~ /\#define UTS_RELEASE "(.*)"/;
-+    		if ($1) {
-+        	    $kernver = $1;
-+        	    last;
-+    		}
-+	    }
-+	    $ver->close();
-+	}
      chomp($kernver);
-     $dir =~ s/\//\./g;
-     return $dir;
-@@ -254,6 +256,8 @@
-     if (!defined($ENV{LUSTRE_VERS}));
+     return $kernver;
+ 
+@@ -143,6 +145,8 @@
+ my $buildid = get_buildid();
  
  if ($progname eq "version_tag.pl") {
 +    chdir($cwd);
 +    chdir($ARGV[1]);
-     my $linuxdir = get_linuxdir();
-     $linuxdir =~ s/\//\./g;
-     generate_ver($tag, $mtime, $linuxdir);
+     my $kernver = "";
+     $kernver = get_kernver($am_linuxdir, $am_linuxobjdir)
+         if ($am_linuxdir ne "");
diff --git a/debian/patches/fix_bashisms_for_dash.patch b/debian/patches/fix_bashisms_for_dash.patch
index 51a195f..3a19fea 100644
--- a/debian/patches/fix_bashisms_for_dash.patch
+++ b/debian/patches/fix_bashisms_for_dash.patch
@@ -3,9 +3,9 @@
 
 Index: lustre/ldiskfs/configure.ac
 ===================================================================
---- lustre.orig/ldiskfs/configure.ac	2010-12-07 16:59:06.421545002 +0100
-+++ lustre/ldiskfs/configure.ac	2010-12-07 17:00:50.253545002 +0100
-@@ -93,7 +93,7 @@
+--- lustre.orig/ldiskfs/configure.ac	2011-11-16 14:10:52.000000000 +0100
++++ lustre/ldiskfs/configure.ac	2011-11-16 14:11:58.646344345 +0100
+@@ -107,7 +107,7 @@
  fi
  
  AC_SUBST(BACKFS)
@@ -16,8 +16,8 @@ Index: lustre/ldiskfs/configure.ac
  AM_CONDITIONAL(USE_EXT4, test x$enable_ext4 = xyes)
 Index: lustre/lustre/tests/llog-test.sh
 ===================================================================
---- lustre.orig/lustre/tests/llog-test.sh	2010-12-07 16:54:32.297545003 +0100
-+++ lustre/lustre/tests/llog-test.sh	2010-12-07 17:00:50.253545002 +0100
+--- lustre.orig/lustre/tests/llog-test.sh	2011-11-16 11:55:25.000000000 +0100
++++ lustre/lustre/tests/llog-test.sh	2011-11-16 14:11:58.650344367 +0100
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
@@ -26,8 +26,8 @@ Index: lustre/lustre/tests/llog-test.sh
  
 Index: lustre/lustre/tests/lnet-selftest.sh
 ===================================================================
---- lustre.orig/lustre/tests/lnet-selftest.sh	2010-12-07 16:54:32.281545003 +0100
-+++ lustre/lustre/tests/lnet-selftest.sh	2010-12-07 17:00:50.281545002 +0100
+--- lustre.orig/lustre/tests/lnet-selftest.sh	2011-11-16 13:56:07.000000000 +0100
++++ lustre/lustre/tests/lnet-selftest.sh	2011-11-16 14:11:58.650344367 +0100
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
@@ -36,21 +36,11 @@ Index: lustre/lustre/tests/lnet-selftest.sh
  . $LUSTRE/tests/test-framework.sh
 Index: lustre/lustre/tests/mdsrate-stat-large.sh
 ===================================================================
---- lustre.orig/lustre/tests/mdsrate-stat-large.sh	2010-12-07 16:54:32.285545003 +0100
-+++ lustre/lustre/tests/mdsrate-stat-large.sh	2010-12-07 17:00:50.281545002 +0100
+--- lustre.orig/lustre/tests/mdsrate-stat-large.sh	2011-11-16 11:55:25.000000000 +0100
++++ lustre/lustre/tests/mdsrate-stat-large.sh	2011-11-16 14:11:58.650344367 +0100
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
  #
  # This test was used in a set of CMD3 tests (cmd3-8 test).
  
-Index: lustre/lustre/tests/rundbench
-===================================================================
---- lustre.orig/lustre/tests/rundbench	2010-12-07 16:54:32.277545003 +0100
-+++ lustre/lustre/tests/rundbench	2010-12-07 17:00:50.281545002 +0100
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- 
- LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
- . $LUSTRE/tests/test-framework.sh
diff --git a/debian/patches/no-darwin.patch b/debian/patches/no-darwin.patch
index 525d796..88319d1 100644
--- a/debian/patches/no-darwin.patch
+++ b/debian/patches/no-darwin.patch
@@ -4,27 +4,25 @@
 
 Index: lustre/lnet/include/libcfs/Makefile.am
 ===================================================================
---- lustre.orig/lnet/include/libcfs/Makefile.am	2010-12-07 16:54:32.917545003 +0100
-+++ lustre/lnet/include/libcfs/Makefile.am	2010-12-07 17:00:08.541545001 +0100
+--- lustre.orig/lnet/include/libcfs/Makefile.am	2011-11-16 13:56:06.000000000 +0100
++++ lustre/lnet/include/libcfs/Makefile.am	2011-11-16 14:04:25.300096325 +0100
 @@ -1,8 +1,8 @@
  SUBDIRS := linux
 -if DARWIN
 -SUBDIRS += darwin
 -endif
--DIST_SUBDIRS := linux darwin
+-DIST_SUBDIRS := linux darwin winnt
 +#if DARWIN
 +#SUBDIRS += darwin
 +#endif
-+DIST_SUBDIRS := $(SUBDIRS)
++DIST_SUBDIRS := linux
  
  EXTRA_DIST := curproc.h kp30.h libcfs.h list.h lltrace.h \
  	portals_utils.h types.h user-lock.h user-prim.h user-time.h \
-Index: lustre/lnet/include/libcfs/Makefile.am.~1~
-===================================================================
 Index: lustre/lnet/include/lnet/Makefile.am
 ===================================================================
---- lustre.orig/lnet/include/lnet/Makefile.am	2010-12-07 16:54:32.933545003 +0100
-+++ lustre/lnet/include/lnet/Makefile.am	2010-12-07 17:00:08.541545001 +0100
+--- lustre.orig/lnet/include/lnet/Makefile.am	2011-11-16 11:55:25.000000000 +0100
++++ lustre/lnet/include/lnet/Makefile.am	2011-11-16 14:02:32.863538781 +0100
 @@ -1,10 +1,10 @@
  lnetdir=$(includedir)/lnet
  
@@ -40,12 +38,10 @@ Index: lustre/lnet/include/lnet/Makefile.am
  
  EXTRA_DIST = api.h api-support.h \
  	lib-lnet.h lib-types.h lnet.h lnetctl.h types.h \
-Index: lustre/lnet/include/lnet/Makefile.am.~1~
-===================================================================
 Index: lustre/lnet/klnds/socklnd/autoMakefile.am
 ===================================================================
---- lustre.orig/lnet/klnds/socklnd/autoMakefile.am	2010-12-07 16:54:32.969545003 +0100
-+++ lustre/lnet/klnds/socklnd/autoMakefile.am	2010-12-07 17:00:08.545545001 +0100
+--- lustre.orig/lnet/klnds/socklnd/autoMakefile.am	2011-11-16 11:55:25.000000000 +0100
++++ lustre/lnet/klnds/socklnd/autoMakefile.am	2011-11-16 14:02:32.867538805 +0100
 @@ -6,21 +6,21 @@
  endif # LINUX
  endif # MODULES
@@ -84,8 +80,8 @@ Index: lustre/lnet/klnds/socklnd/autoMakefile.am
  
 Index: lustre/lnet/libcfs/autoMakefile.am
 ===================================================================
---- lustre.orig/lnet/libcfs/autoMakefile.am	2010-12-07 16:54:32.945545003 +0100
-+++ lustre/lnet/libcfs/autoMakefile.am	2010-12-07 17:00:08.545545001 +0100
+--- lustre.orig/lnet/libcfs/autoMakefile.am	2011-11-16 11:55:25.000000000 +0100
++++ lustre/lnet/libcfs/autoMakefile.am	2011-11-16 14:02:32.875538844 +0100
 @@ -35,10 +35,10 @@
  #
  
@@ -148,8 +144,8 @@ Index: lustre/lnet/libcfs/autoMakefile.am
  
 Index: lustre/lnet/lnet/autoMakefile.am
 ===================================================================
---- lustre.orig/lnet/lnet/autoMakefile.am	2010-12-07 16:54:32.953545003 +0100
-+++ lustre/lnet/lnet/autoMakefile.am	2010-12-07 17:00:08.545545001 +0100
+--- lustre.orig/lnet/lnet/autoMakefile.am	2011-11-16 11:55:25.000000000 +0100
++++ lustre/lnet/lnet/autoMakefile.am	2011-11-16 14:02:32.883538883 +0100
 @@ -18,23 +18,23 @@
  modulenet_DATA = lnet$(KMODEXT)
  endif # LINUX
@@ -193,8 +189,8 @@ Index: lustre/lnet/lnet/autoMakefile.am
  
 Index: lustre/lustre/lov/autoMakefile.am
 ===================================================================
---- lustre.orig/lustre/lov/autoMakefile.am	2010-12-07 16:54:32.981545003 +0100
-+++ lustre/lustre/lov/autoMakefile.am	2010-12-07 17:00:08.545545001 +0100
+--- lustre.orig/lustre/lov/autoMakefile.am	2011-11-16 11:55:25.000000000 +0100
++++ lustre/lustre/lov/autoMakefile.am	2011-11-16 14:02:32.883538883 +0100
 @@ -46,29 +46,29 @@
  modulefs_DATA = lov$(KMODEXT)
  endif
@@ -246,8 +242,8 @@ Index: lustre/lustre/lov/autoMakefile.am
  
 Index: lustre/lustre/lvfs/autoMakefile.am
 ===================================================================
---- lustre.orig/lustre/lvfs/autoMakefile.am	2010-12-07 16:54:32.989545003 +0100
-+++ lustre/lustre/lvfs/autoMakefile.am	2010-12-07 17:00:08.545545001 +0100
+--- lustre.orig/lustre/lvfs/autoMakefile.am	2011-11-16 11:55:25.000000000 +0100
++++ lustre/lustre/lvfs/autoMakefile.am	2011-11-16 14:02:32.883538883 +0100
 @@ -85,21 +85,21 @@
  
  endif # LINUX
@@ -287,8 +283,8 @@ Index: lustre/lustre/lvfs/autoMakefile.am
  
 Index: lustre/lustre/obdclass/autoMakefile.am
 ===================================================================
---- lustre.orig/lustre/obdclass/autoMakefile.am	2010-12-07 16:54:33.033545003 +0100
-+++ lustre/lustre/obdclass/autoMakefile.am	2010-12-07 17:00:08.545545001 +0100
+--- lustre.orig/lustre/obdclass/autoMakefile.am	2011-11-16 11:55:25.000000000 +0100
++++ lustre/lustre/obdclass/autoMakefile.am	2011-11-16 14:02:32.883538883 +0100
 @@ -1,8 +1,8 @@
  SUBDIRS := linux
 -if DARWIN
@@ -349,8 +345,8 @@ Index: lustre/lustre/obdclass/autoMakefile.am
  
 Index: lustre/lustre/obdecho/autoMakefile.am
 ===================================================================
---- lustre.orig/lustre/obdecho/autoMakefile.am	2010-12-07 16:54:33.001545003 +0100
-+++ lustre/lustre/obdecho/autoMakefile.am	2010-12-07 17:00:08.545545001 +0100
+--- lustre.orig/lustre/obdecho/autoMakefile.am	2011-11-16 11:55:25.000000000 +0100
++++ lustre/lustre/obdecho/autoMakefile.am	2011-11-16 14:02:32.883538883 +0100
 @@ -46,22 +46,22 @@
  modulefs_DATA = obdecho$(KMODEXT)
  endif
@@ -392,8 +388,8 @@ Index: lustre/lustre/obdecho/autoMakefile.am
  
 Index: lustre/lustre/osc/autoMakefile.am
 ===================================================================
---- lustre.orig/lustre/osc/autoMakefile.am	2010-12-07 16:54:33.021545003 +0100
-+++ lustre/lustre/osc/autoMakefile.am	2010-12-07 17:00:08.549545001 +0100
+--- lustre.orig/lustre/osc/autoMakefile.am	2011-11-16 11:55:25.000000000 +0100
++++ lustre/lustre/osc/autoMakefile.am	2011-11-16 14:02:32.883538883 +0100
 @@ -47,22 +47,22 @@
  modulefs_DATA = osc$(KMODEXT)
  endif
@@ -435,8 +431,8 @@ Index: lustre/lustre/osc/autoMakefile.am
  
 Index: lustre/lustre/ptlrpc/autoMakefile.am
 ===================================================================
---- lustre.orig/lustre/ptlrpc/autoMakefile.am	2010-12-07 16:54:33.009545003 +0100
-+++ lustre/lustre/ptlrpc/autoMakefile.am	2010-12-07 17:00:08.549545001 +0100
+--- lustre.orig/lustre/ptlrpc/autoMakefile.am	2011-11-16 11:55:25.000000000 +0100
++++ lustre/lustre/ptlrpc/autoMakefile.am	2011-11-16 14:02:32.883538883 +0100
 @@ -68,39 +68,39 @@
  modulefs_DATA = ptlrpc$(KMODEXT)
  endif #LINUX

-- 
Lustre Debian Packaging

More information about the Pkg-lustre-svn-commit mailing list