[Pkg-lustre-svn-commit] updated: [4e79c12] detect-2.6.32-vanilla.patch

[Marco Nelles]

The following commit has been merged in the master branch:
commit 4e79c123c4b2896a5db6156d2b74f6c8b2a081a3
Author: Marco Nelles <marco.nelles at credativ.de>
Date:   Thu Jul 5 14:29:20 2012 +0200

    detect-2.6.32-vanilla.patch

diff --git a/debian/patches/detect-2.6.32-vanilla.patch b/debian/patches/detect-2.6.32-vanilla.patch
index 26cfa5a..9e8e19a 100644
--- a/debian/patches/detect-2.6.32-vanilla.patch
+++ b/debian/patches/detect-2.6.32-vanilla.patch
@@ -28,3 +28,33 @@ index c02f15a..a3bc7fd 100644
  		fi
  		;;
  	*)
+diff --git a/build/autoconf/lustre-build-ldiskfs.m4 b/build/autoconf/lustre-build-ldiskfs.m4
+index c02f15a..a3bc7fd 100644
+--- a/build/autoconf/lustre-build-ldiskfs.m4
++++ b/build/autoconf/lustre-build-ldiskfs.m4
+@@ -244,8 +244,10 @@ if test $LDISKFS_BACKFS = 'ext4'; then
+ 		if test x$RHEL_KERNEL = xyes; then
+ 			with_ldiskfs_pdo=yes
+ 			AC_DEFINE(HAVE_LDISKFS_PDO, 1, [have ldiskfs PDO patch])
+-		fi
+-		if test x$SUSE_KERNEL = xyes; then
++		elif test x$SUSE_KERNEL = xyes; then
++			with_ldiskfs_pdo=yes
++			AC_DEFINE(HAVE_LDISKFS_PDO, 1, [have ldiskfs PDO patch])
++		else
+ 			with_ldiskfs_pdo=yes
+ 			AC_DEFINE(HAVE_LDISKFS_PDO, 1, [have ldiskfs PDO patch])
+		fi
+@@ -464,9 +466,10 @@ if $1; then
+ 	2.6.32*)
+ 		if test x$RHEL_KERNEL = xyes; then
+ 			LDISKFS_SERIES="2.6-rhel6.series"
+-		fi
+-		if test x$SUSE_KERNEL = xyes; then
++		elif test x$SUSE_KERNEL = xyes; then
+			LDISKFS_SERIES="2.6-sles11.series"
++		else
++			LDISKFS_SERIES="2.6.32-vanilla.series"
+		fi
+		;;
+	*)

-- 
Lustre Debian Packaging