The following commit has been merged in the master branch:
commit fdf7895abe0b25a8f1317117194488492605ec97
Author: Marco Nelles <marco.nel...@credativ.de>
Date:   Tue Jul 3 15:00:50 2012 +0200

    Detect 2.6.32 vanilla kernel patch

diff --git a/debian/patches/detect-2.6.32-vanilla.patch 
b/debian/patches/detect-2.6.32-vanilla.patch
new file mode 100644
index 0000000..2333a21
--- /dev/null
+++ b/debian/patches/detect-2.6.32-vanilla.patch
@@ -0,0 +1,34 @@
+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; }
+       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-vailla.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
diff --git a/debian/patches/series b/debian/patches/series
index bcb81f5..d18d634 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,5 +15,6 @@ fix-oot-builds.patch
 no-strict-aliasing.patch
 fix-bashisms-for-dash.patch
 cacheflush-remove-mark-rodata.patch
+detect-2.6.32-vanilla.patch
 lustre-kernel-patchset.patch
 ldiskfs-kernel-patchset.patch

-- 
Lustre Debian Packaging 

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

Reply via email to