The following commit has been merged in the master branch:
commit 1048e3ca9d33c0ace10c77bfca3bab358905a38a
Author: Patrick Winnertz <win...@debian.org>
Date:   Mon Mar 8 10:28:16 2010 +0100

    Updated no-strict-aliasing patch & removed autogen-run patch from 00list
    
    Signed-off-by: Patrick Winnertz <win...@debian.org>

diff --git a/debian/patches/00list b/debian/patches/00list
index c818957..cd452ea 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -29,5 +29,4 @@ fix_various_typecasts.dpatch
 #build-fixes-for_2.6.18_servers.dpatch
 no-strict-aliasing.dpatch
 fix_bashisms_for_dash.dpatch
-configure_error_on_unstable.patch
-autogen-run.dpatch
+configure_error_on_unstable.dpatch
diff --git a/debian/patches/no-strict-aliasing.dpatch 
b/debian/patches/no-strict-aliasing.dpatch
index 14df659..ff8bd8f 100755
--- a/debian/patches/no-strict-aliasing.dpatch
+++ b/debian/patches/no-strict-aliasing.dpatch
@@ -1,14 +1,15 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## no-strict-aliasing.dpatch by Patrick Winnertz <win...@debian.org>
+## no_default_debugging.patch by Patrick Winnertz <win...@debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Build lustre wit -fno-strict-aliasing as it otherwise fails to compile 
with gcc-4.4
 
 @DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/aclocal.m4 lustre/aclocal.m4
---- lustre~/aclocal.m4 2010-03-04 17:19:41.000000000 +0100
-+++ lustre/aclocal.m4  2010-03-04 17:24:17.838594736 +0100
-@@ -1681,7 +1681,7 @@
+diff --git a/aclocal.m4 b/aclocal.m4
+index bf2b8cd..7f3a4ef 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -1681,7 +1681,7 @@ LB_LINUX_TRY_COMPILE([
  AC_DEFUN([LC_UMOUNTBEGIN_HAS_VFSMOUNT],
  [AC_MSG_CHECKING([if umount_begin needs vfsmount parameter instead of 
super_block])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -17,7 +18,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch'
  LB_LINUX_TRY_COMPILE([
        #include <linux/fs.h>
  
-@@ -1746,7 +1746,7 @@
+@@ -1746,7 +1746,7 @@ LB_LINUX_TRY_COMPILE([
  AC_DEFUN([LC_VFS_READDIR_U64_INO],
  [AC_MSG_CHECKING([check vfs_readdir need 64bit inode number])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -26,7 +27,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch'
  LB_LINUX_TRY_COMPILE([
  #include <linux/fs.h>
        int fillonedir(void * __buf, const char * name, int namlen, loff_t 
offset,
-@@ -2086,7 +2086,7 @@
+@@ -2086,7 +2086,7 @@ LB_LINUX_TRY_COMPILE([
  AC_DEFUN([LC_RW_TREE_LOCK],
  [AC_MSG_CHECKING([if kernel has tree_lock as rwlock])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -35,7 +36,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch'
  LB_LINUX_TRY_COMPILE([
          #include <linux/fs.h>
  ],[
-@@ -2214,7 +2214,7 @@
+@@ -2214,7 +2214,7 @@ AC_DEFUN([LC_REGISTER_SHRINKER],
  ],[
          AC_MSG_CHECKING([if kernel using gfp_t for shrinker second paramter])
          tmp_flags="$EXTRA_KCFLAGS"
@@ -44,7 +45,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch'
          LB_LINUX_TRY_COMPILE([
                  #include <linux/mm.h>
          ],[
-@@ -2454,7 +2454,7 @@
+@@ -2454,7 +2454,7 @@ LB_LINUX_TRY_COMPILE([
  AC_DEFUN([LC_RW_TREE_LOCK],
  [AC_MSG_CHECKING([mapping->tree_lock is rw_lock])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -53,7 +54,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch'
  LB_LINUX_TRY_COMPILE([
        #include <linux/fs.h>
  ],[
-@@ -3246,7 +3246,7 @@
+@@ -3246,7 +3246,7 @@ AC_DEFUN([LC_CONFIGURE],
  [LC_CONFIG_OBD_BUFFER_SIZE
  
  if test $target_cpu == "i686" -o $target_cpu == "x86_64"; then
@@ -62,16 +63,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  fi
  
  # include/liblustre.h
-@@ -3746,7 +3746,7 @@
- AC_DEFUN([LB_LINUX_COMPILE_IFELSE],
- [m4_ifvaln([$1], [LB_LINUX_CONFTEST([$1])])dnl
- rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
--AS_IF([AC_TRY_COMMAND(cp conftest.c build && make -d [$2] ${LD:+"LD=$LD"} 
CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG 
LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 
's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include 
-I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include 
include/linux/autoconf.h" -o tmp_include_depends -o scripts -o 
include/config/MARKER -C $LINUX_OBJ 
EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM 
$MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])],
-+AS_IF([AC_TRY_COMMAND(cp conftest.c build && make -d [$2] ${LD:+"LD=$LD"} 
CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG 
LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 
's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include 
-I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include 
include/linux/autoconf.h" -o tmp_include_depends -o scripts -o 
include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror 
-fno-strict-aliasing-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM 
$MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])],
-       [$4],
-       [_AC_MSG_LOG_CONFTEST
- m4_ifvaln([$5],[$5])dnl])dnl
-@@ -5093,7 +5093,7 @@
+@@ -5093,7 +5093,7 @@ AC_DEFINE(HAVE_SHOW_TASK, 1, [show_task is exported])
  AC_DEFUN([LN_KERN__U64_LONG_LONG],
  [AC_MSG_CHECKING([kernel __u64 is long long type])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -80,7 +72,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch'
  LB_LINUX_TRY_COMPILE([
        #include <linux/types.h>
        #include <linux/stddef.h>
-@@ -5116,7 +5116,7 @@
+@@ -5116,7 +5116,7 @@ EXTRA_KCFLAGS="$tmp_flags"
  AC_DEFUN([LN_USER__U64_LONG_LONG],
  [AC_MSG_CHECKING([userspace __u64 is long long type])
  tmp_flags="$CFLAGS"
@@ -89,7 +81,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch'
  AC_COMPILE_IFELSE([
        #include <linux/types.h>
        #include <linux/stddef.h>
-@@ -5141,7 +5141,7 @@
+@@ -5141,7 +5141,7 @@ CFLAGS="$tmp_flags"
  AC_DEFUN([LN_SIZE_T_LONG],
  [AC_MSG_CHECKING([size_t is unsigned long type])
  tmp_flags="$CFLAGS"
@@ -98,7 +90,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch'
  AC_COMPILE_IFELSE([
        #include <linux/types.h>
        #include <linux/stddef.h>
-@@ -5165,7 +5165,7 @@
+@@ -5165,7 +5165,7 @@ CFLAGS="$tmp_flags"
  AC_DEFUN([LN_SSIZE_T_LONG],
  [AC_MSG_CHECKING([ssize_t is signed long type])
  tmp_flags="$CFLAGS"
@@ -107,7 +99,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  AC_COMPILE_IFELSE([
        #include <linux/types.h>
        #include <linux/stddef.h>
-@@ -5312,7 +5312,7 @@
+@@ -5312,7 +5312,7 @@ LB_LINUX_TRY_COMPILE([
  AC_DEFUN([LN_KMEM_CACHE],
  [AC_MSG_CHECKING([check kernel has struct kmem_cache])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -116,7 +108,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  LB_LINUX_TRY_COMPILE([
          #include <linux/slab.h>
          typedef struct kmem_cache cache_t;
-@@ -5356,7 +5356,7 @@
+@@ -5356,7 +5356,7 @@ AC_DEFUN([LN_FUNC_DUMP_TRACE],
  [LB_CHECK_SYMBOL_EXPORT([dump_trace],
  [kernel/ksyms.c arch/${LINUX_ARCH%_64}/kernel/traps_64.c],[
        tmp_flags="$EXTRA_KCFLAGS"
@@ -125,7 +117,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
        AC_MSG_CHECKING([whether we can really use dump_trace])
        LB_LINUX_TRY_COMPILE([
                struct task_struct;
-@@ -5510,7 +5510,7 @@
+@@ -5510,7 +5510,7 @@ LB_LINUX_TRY_COMPILE([
  AC_DEFUN([LN_FUNC_UNSHARE_FS_STRUCT],
  [AC_MSG_CHECKING([if kernel defines unshare_fs_struct()])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -134,7 +126,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  LB_LINUX_TRY_COMPILE([
        #include <linux/sched.h>
        #include <linux/fs_struct.h>
-@@ -6705,7 +6705,7 @@
+@@ -6705,7 +6705,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
        # icc doesn't choke on unknown options, it will just issue warnings
@@ -143,22 +135,13 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
        # that says an option was ignored.
        if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
          am_cv_$1_dependencies_compiler_type=$depmode
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/build/autoconf/lustre-build-linux.m4 
lustre/build/autoconf/lustre-build-linux.m4
---- lustre~/build/autoconf/lustre-build-linux.m4       2010-03-04 
17:19:41.000000000 +0100
-+++ lustre/build/autoconf/lustre-build-linux.m4        2010-03-04 
17:24:17.842620596 +0100
-@@ -340,7 +340,7 @@
- AC_DEFUN([LB_LINUX_COMPILE_IFELSE],
- [m4_ifvaln([$1], [LB_LINUX_CONFTEST([$1])])dnl
- rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
--AS_IF([AC_TRY_COMMAND(cp conftest.c build && make -d [$2] ${LD:+"LD=$LD"} 
CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG 
LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 
's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include 
-I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include 
include/linux/autoconf.h" -o tmp_include_depends -o scripts -o 
include/config/MARKER -C $LINUX_OBJ 
EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM 
$MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])],
-+AS_IF([AC_TRY_COMMAND(cp conftest.c build && make -d [$2] ${LD:+"LD=$LD"} 
CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG 
LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 
's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include 
-I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include 
include/linux/autoconf.h" -o tmp_include_depends -o scripts -o 
include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror 
-fno-strict-aliasing-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM 
$MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])],
-       [$4],
-       [_AC_MSG_LOG_CONFTEST
- m4_ifvaln([$5],[$5])dnl])dnl
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/ldiskfs/aclocal.m4 lustre/ldiskfs/aclocal.m4
---- lustre~/ldiskfs/aclocal.m4 2010-03-04 17:19:41.000000000 +0100
-+++ lustre/ldiskfs/aclocal.m4  2010-03-04 17:24:17.854594743 +0100
-@@ -596,7 +596,7 @@
+diff --git a/debian/patches/no-strict-aliasing.dpatch 
b/debian/patches/no-strict-aliasing.dpatch
+index 14df659..6fabe2e 100755
+diff --git a/ldiskfs/aclocal.m4 b/ldiskfs/aclocal.m4
+index 9df75ae..e1a20c5 100644
+--- a/ldiskfs/aclocal.m4
++++ b/ldiskfs/aclocal.m4
+@@ -596,7 +596,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
        # icc doesn't choke on unknown options, it will just issue warnings
@@ -167,31 +150,11 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
        # that says an option was ignored.
        if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
          am_cv_$1_dependencies_compiler_type=$depmode
-@@ -2148,7 +2148,7 @@
- AC_DEFUN([LB_LINUX_COMPILE_IFELSE],
- [m4_ifvaln([$1], [LB_LINUX_CONFTEST([$1])])dnl
- rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
--AS_IF([AC_TRY_COMMAND(cp conftest.c build && make -d [$2] ${LD:+"LD=$LD"} 
CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG 
LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 
's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include 
-I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include 
include/linux/autoconf.h" -o tmp_include_depends -o scripts -o 
include/config/MARKER -C $LINUX_OBJ 
EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM 
$MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])],
-+AS_IF([AC_TRY_COMMAND(cp conftest.c build && make -d [$2] ${LD:+"LD=$LD"} 
CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG 
LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 
's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include 
-I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include 
include/linux/autoconf.h" -o tmp_include_depends -o scripts -o 
include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror 
-fno-strict-aliasing-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM 
$MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])],
-       [$4],
-       [_AC_MSG_LOG_CONFTEST
- m4_ifvaln([$5],[$5])dnl])dnl
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/ldiskfs/build/autoconf/lustre-build-linux.m4 
lustre/ldiskfs/build/autoconf/lustre-build-linux.m4
---- lustre~/ldiskfs/build/autoconf/lustre-build-linux.m4       2010-03-04 
17:19:41.000000000 +0100
-+++ lustre/ldiskfs/build/autoconf/lustre-build-linux.m4        2010-03-04 
17:24:17.858604121 +0100
-@@ -340,7 +340,7 @@
- AC_DEFUN([LB_LINUX_COMPILE_IFELSE],
- [m4_ifvaln([$1], [LB_LINUX_CONFTEST([$1])])dnl
- rm -f build/conftest.o build/conftest.mod.c build/conftest.ko
--AS_IF([AC_TRY_COMMAND(cp conftest.c build && make -d [$2] ${LD:+"LD=$LD"} 
CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG 
LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 
's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include 
-I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include 
include/linux/autoconf.h" -o tmp_include_depends -o scripts -o 
include/config/MARKER -C $LINUX_OBJ 
EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM 
$MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])],
-+AS_IF([AC_TRY_COMMAND(cp conftest.c build && make -d [$2] ${LD:+"LD=$LD"} 
CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG 
LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 
's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include 
-I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include 
include/linux/autoconf.h" -o tmp_include_depends -o scripts -o 
include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror 
-fno-strict-aliasing-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM 
$MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])],
-       [$4],
-       [_AC_MSG_LOG_CONFTEST
- m4_ifvaln([$5],[$5])dnl])dnl
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/libsysio/aclocal.m4 lustre/libsysio/aclocal.m4
---- lustre~/libsysio/aclocal.m4        2010-03-03 17:25:38.000000000 +0100
-+++ lustre/libsysio/aclocal.m4 2010-03-04 17:24:17.874623056 +0100
-@@ -221,7 +221,7 @@
+diff --git a/libsysio/aclocal.m4 b/libsysio/aclocal.m4
+index fd273ba..b236478 100644
+--- a/libsysio/aclocal.m4
++++ b/libsysio/aclocal.m4
+@@ -221,7 +221,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
        # icc doesn't choke on unknown options, it will just issue warnings
@@ -200,10 +163,11 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
        # that says an option was ignored or not supported.
        # When given -MP, icc 7.0 and 7.1 complain thusly:
        #   icc: Command line warning: ignoring option '-M'; no argument 
required
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/libsysio/configure.in lustre/libsysio/configure.in
---- lustre~/libsysio/configure.in      2010-03-04 17:19:41.000000000 +0100
-+++ lustre/libsysio/configure.in       2010-03-04 17:24:17.878595767 +0100
-@@ -362,7 +362,7 @@
+diff --git a/libsysio/configure.in b/libsysio/configure.in
+index 5ce600f..af030bc 100644
+--- a/libsysio/configure.in
++++ b/libsysio/configure.in
+@@ -362,7 +362,7 @@ fi
  
  AC_MSG_CHECKING(for POSIX 2008 preadv)
  tmp_flags="$CFLAGS"
@@ -212,7 +176,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  AC_TRY_COMPILE([
  #include <sys/uio.h>
  ssize_t preadv (int __fd, const struct iovec *__iovec,
-@@ -381,7 +381,7 @@
+@@ -381,7 +381,7 @@ CFLAGS="$tmp_flags"
  
  AC_MSG_CHECKING(for POSIX 2008 scandir)
  tmp_flags="$CFLAGS"
@@ -221,10 +185,11 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  AC_TRY_COMPILE([
  #define _BSD_SOURCE
  
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lnet/autoconf/lustre-lnet.m4 lustre/lnet/autoconf/lustre-lnet.m4
---- lustre~/lnet/autoconf/lustre-lnet.m4       2010-03-04 17:19:41.000000000 
+0100
-+++ lustre/lnet/autoconf/lustre-lnet.m4        2010-03-04 17:24:17.886619412 
+0100
-@@ -1073,7 +1073,7 @@
+diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
+index 6297224..0575e72 100644
+--- a/lnet/autoconf/lustre-lnet.m4
++++ b/lnet/autoconf/lustre-lnet.m4
+@@ -1073,7 +1073,7 @@ AC_DEFINE(HAVE_SHOW_TASK, 1, [show_task is exported])
  AC_DEFUN([LN_KERN__U64_LONG_LONG],
  [AC_MSG_CHECKING([kernel __u64 is long long type])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -233,7 +198,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  LB_LINUX_TRY_COMPILE([
        #include <linux/types.h>
        #include <linux/stddef.h>
-@@ -1096,7 +1096,7 @@
+@@ -1096,7 +1096,7 @@ EXTRA_KCFLAGS="$tmp_flags"
  AC_DEFUN([LN_USER__U64_LONG_LONG],
  [AC_MSG_CHECKING([userspace __u64 is long long type])
  tmp_flags="$CFLAGS"
@@ -242,7 +207,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  AC_COMPILE_IFELSE([
        #include <linux/types.h>
        #include <linux/stddef.h>
-@@ -1121,7 +1121,7 @@
+@@ -1121,7 +1121,7 @@ CFLAGS="$tmp_flags"
  AC_DEFUN([LN_SIZE_T_LONG],
  [AC_MSG_CHECKING([size_t is unsigned long type])
  tmp_flags="$CFLAGS"
@@ -251,7 +216,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  AC_COMPILE_IFELSE([
        #include <linux/types.h>
        #include <linux/stddef.h>
-@@ -1145,7 +1145,7 @@
+@@ -1145,7 +1145,7 @@ CFLAGS="$tmp_flags"
  AC_DEFUN([LN_SSIZE_T_LONG],
  [AC_MSG_CHECKING([ssize_t is signed long type])
  tmp_flags="$CFLAGS"
@@ -260,7 +225,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  AC_COMPILE_IFELSE([
        #include <linux/types.h>
        #include <linux/stddef.h>
-@@ -1292,7 +1292,7 @@
+@@ -1292,7 +1292,7 @@ LB_LINUX_TRY_COMPILE([
  AC_DEFUN([LN_KMEM_CACHE],
  [AC_MSG_CHECKING([check kernel has struct kmem_cache])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -269,7 +234,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  LB_LINUX_TRY_COMPILE([
          #include <linux/slab.h>
          typedef struct kmem_cache cache_t;
-@@ -1336,7 +1336,7 @@
+@@ -1336,7 +1336,7 @@ AC_DEFUN([LN_FUNC_DUMP_TRACE],
  [LB_CHECK_SYMBOL_EXPORT([dump_trace],
  [kernel/ksyms.c arch/${LINUX_ARCH%_64}/kernel/traps_64.c],[
        tmp_flags="$EXTRA_KCFLAGS"
@@ -278,7 +243,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
        AC_MSG_CHECKING([whether we can really use dump_trace])
        LB_LINUX_TRY_COMPILE([
                struct task_struct;
-@@ -1490,7 +1490,7 @@
+@@ -1490,7 +1490,7 @@ LB_LINUX_TRY_COMPILE([
  AC_DEFUN([LN_FUNC_UNSHARE_FS_STRUCT],
  [AC_MSG_CHECKING([if kernel defines unshare_fs_struct()])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -287,10 +252,11 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  LB_LINUX_TRY_COMPILE([
        #include <linux/sched.h>
        #include <linux/fs_struct.h>
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre-core.m4
---- lustre~/lustre/autoconf/lustre-core.m4     2010-03-04 17:22:31.782596837 
+0100
-+++ lustre/lustre/autoconf/lustre-core.m4      2010-03-04 17:24:17.898595234 
+0100
-@@ -651,7 +651,7 @@
+diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
+index d01d8e0..db1a665 100644
+--- a/lustre/autoconf/lustre-core.m4
++++ b/lustre/autoconf/lustre-core.m4
+@@ -651,7 +651,7 @@ LB_LINUX_TRY_COMPILE([
  AC_DEFUN([LC_UMOUNTBEGIN_HAS_VFSMOUNT],
  [AC_MSG_CHECKING([if umount_begin needs vfsmount parameter instead of 
super_block])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -299,7 +265,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  LB_LINUX_TRY_COMPILE([
        #include <linux/fs.h>
  
-@@ -716,7 +716,7 @@
+@@ -716,7 +716,7 @@ LB_LINUX_TRY_COMPILE([
  AC_DEFUN([LC_VFS_READDIR_U64_INO],
  [AC_MSG_CHECKING([check vfs_readdir need 64bit inode number])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -308,7 +274,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  LB_LINUX_TRY_COMPILE([
  #include <linux/fs.h>
        int fillonedir(void * __buf, const char * name, int namlen, loff_t 
offset,
-@@ -1056,7 +1056,7 @@
+@@ -1056,7 +1056,7 @@ LB_LINUX_TRY_COMPILE([
  AC_DEFUN([LC_RW_TREE_LOCK],
  [AC_MSG_CHECKING([if kernel has tree_lock as rwlock])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -317,7 +283,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  LB_LINUX_TRY_COMPILE([
          #include <linux/fs.h>
  ],[
-@@ -1184,7 +1184,7 @@
+@@ -1184,7 +1184,7 @@ AC_DEFUN([LC_REGISTER_SHRINKER],
  ],[
          AC_MSG_CHECKING([if kernel using gfp_t for shrinker second paramter])
          tmp_flags="$EXTRA_KCFLAGS"
@@ -326,7 +292,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
          LB_LINUX_TRY_COMPILE([
                  #include <linux/mm.h>
          ],[
-@@ -1424,7 +1424,7 @@
+@@ -1424,7 +1424,7 @@ LB_LINUX_TRY_COMPILE([
  AC_DEFUN([LC_RW_TREE_LOCK],
  [AC_MSG_CHECKING([mapping->tree_lock is rw_lock])
  tmp_flags="$EXTRA_KCFLAGS"
@@ -335,7 +301,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  LB_LINUX_TRY_COMPILE([
        #include <linux/fs.h>
  ],[
-@@ -2217,7 +2217,7 @@
+@@ -2216,7 +2216,7 @@ AC_DEFUN([LC_CONFIGURE],
  [LC_CONFIG_OBD_BUFFER_SIZE
  
  if test $target_cpu == "i686" -o $target_cpu == "x86_64"; then

-- 
Lustre Debian Packaging 

_______________________________________________
Pkg-lustre-svn-commit mailing list
Pkg-lustre-svn-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-lustre-svn-commit

Reply via email to