[Pkg-lustre-svn-commit] updated: [9194f2d] Build ldiskfs kernel module also on plain debian kernel

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 9194f2d6cd955f98e57f278b38550727a4cd15a9
Author: Patrick Winnertz <winnie at debian.org>
Date:   Fri Aug 5 11:11:37 2011 +0200

    Build ldiskfs kernel module also on plain debian kernel
    
    Signed-off-by: Patrick Winnertz <winnie at debian.org>

diff --git a/debian/patches/ldiskfs-detect-2.6.20-2.6.22.patch b/debian/patches/ldiskfs-detect-2.6.20-2.6.22.patch
index af2ff69..c8d08a6 100644
--- a/debian/patches/ldiskfs-detect-2.6.20-2.6.22.patch
+++ b/debian/patches/ldiskfs-detect-2.6.20-2.6.22.patch
@@ -3,9 +3,9 @@
 
 Index: lustre/ldiskfs/configure.ac
 ===================================================================
---- lustre.orig/ldiskfs/configure.ac	2010-12-07 16:54:33.185545003 +0100
-+++ lustre/ldiskfs/configure.ac	2010-12-07 16:59:06.421545002 +0100
-@@ -114,11 +114,16 @@
+--- lustre.orig/ldiskfs/configure.ac	2011-08-05 11:10:05.195251849 +0200
++++ lustre/ldiskfs/configure.ac	2011-08-05 11:11:19.987622721 +0200
+@@ -114,13 +114,18 @@
                  else
  		        LDISKFS_SERIES="2.6-rhel5.series"
                  fi
@@ -21,5 +21,8 @@ Index: lustre/ldiskfs/configure.ac
  2.6.22*) LDISKFS_SERIES="2.6.22-vanilla.series";;
 +2.6.26*) LDISKFS_SERIES="2.6.26-vanilla.series";;
  2.6.27*) LDISKFS_SERIES="2.6-sles11.series";;
- 2.6.32.*) LDISKFS_SERIES="2.6-sles11.series";;
+-2.6.32.*) LDISKFS_SERIES="2.6-sles11.series";;
++2.6.32*) LDISKFS_SERIES="2.6-sles11.series";;
  *) AC_MSG_WARN([Unknown kernel version $LINUXRELEASE, fix ldiskfs/configure.ac])
+ esac
+ AC_MSG_RESULT([$LDISKFS_SERIES])

-- 
Lustre Debian Packaging