[Pkg-lustre-svn-commit] updated: [d84c6d9] Adapted detect-2.6.32-vanilla.patch

[Marco Nelles]

The following commit has been merged in the master branch:
commit d84c6d914a851b830ef396cd52187719a88045eb
Author: Marco Nelles <marco.nelles at credativ.de>
Date:   Thu Jul 5 11:06:52 2012 +0200

    Adapted 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 2333a21..26cfa5a 100644
--- a/debian/patches/detect-2.6.32-vanilla.patch
+++ b/debian/patches/detect-2.6.32-vanilla.patch
@@ -1,8 +1,21 @@
-diff --git a/ldiskfs/configure b/ldiskfs/configure
-index a0e88f5..bdc277a 100755
---- a/ldiskfs/configure
-+++ b/ldiskfs/configure
-@@ -6310,9 +6310,10 @@ $as_echo_n "checking which ldiskfs series to use... " >&6; }
+diff --git a/ldiskfs/build/autoconf/lustre-build-ldiskfs.m4 b/ldiskfs/build/autoconf/lustre-build-ldiskfs.m4
+index c02f15a..a3bc7fd 100644
+--- a/ldiskfs/build/autoconf/lustre-build-ldiskfs.m4
++++ b/ldiskfs/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"
@@ -11,24 +24,7 @@ index a0e88f5..bdc277a 100755
 +		elif test x$SUSE_KERNEL = xyes; then
  			LDISKFS_SERIES="2.6-sles11.series"
 +		else
-+			LDISKFS_SERIES="2.6.32-vailla.series"
++			LDISKFS_SERIES="2.6.32-vanilla.series"
  		fi
  		;;
  	*)
-@@ -6709,8 +6710,14 @@ cat >>confdefs.h <<\_ACEOF
- #define HAVE_LDISKFS_PDO 1
- _ACEOF
- 
--		fi
--		if test x$SUSE_KERNEL = xyes; then
-+		elif test x$SUSE_KERNEL = xyes; then
-+			with_ldiskfs_pdo=yes
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LDISKFS_PDO 1
-+_ACEOF
-+
-+		else
- 			with_ldiskfs_pdo=yes
- 
- cat >>confdefs.h <<\_ACEOF

-- 
Lustre Debian Packaging