The following commit has been merged in the master branch:
commit 8078e6895e2917cee8265e0b9db3eb3d107dc40e
Author: Marco Nelles <marco.nel...@credativ.de>
Date: Thu Jul 5 14:35:02 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 9e8e19a..ec2e1d8 100644
--- a/debian/patches/detect-2.6.32-vanilla.patch
+++ b/debian/patches/detect-2.6.32-vanilla.patch
@@ -1,7 +1,7 @@
-diff --git a/ldiskfs/build/autoconf/lustre-build-ldiskfs.m4
b/ldiskfs/build/autoconf/lustre-build-ldiskfs.m4
+diff --git a/build/autoconf/lustre-build-ldiskfs.m4
b/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
+--- 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
@@ -28,10 +28,76 @@ index c02f15a..a3bc7fd 100644
fi
;;
*)
-diff --git a/build/autoconf/lustre-build-ldiskfs.m4
b/build/autoconf/lustre-build-ldiskfs.m4
+diff --git a/debian/patches/detect-2.6.32-vanilla.patch
b/debian/patches/detect-2.6.32-vanilla.patch
+deleted file mode 100644
+index 9e8e19a..0000000
+--- a/debian/patches/detect-2.6.32-vanilla.patch
++++ /dev/null
+@@ -1,60 +0,0 @@
+-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"
+-- 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
+- ;;
+- *)
+-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
+- ;;
+- *)
+diff --git a/ldiskfs/build/autoconf/lustre-build-ldiskfs.m4
b/ldiskfs/build/autoconf/lustre-build-ldiskfs.m4
index c02f15a..a3bc7fd 100644
---- a/build/autoconf/lustre-build-ldiskfs.m4
-+++ b/build/autoconf/lustre-build-ldiskfs.m4
+--- 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
@@ -44,7 +110,7 @@ index c02f15a..a3bc7fd 100644
+ else
with_ldiskfs_pdo=yes
AC_DEFINE(HAVE_LDISKFS_PDO, 1, [have ldiskfs PDO patch])
- fi
+ fi
@@ -464,9 +466,10 @@ if $1; then
2.6.32*)
if test x$RHEL_KERNEL = xyes; then
@@ -52,9 +118,9 @@ index c02f15a..a3bc7fd 100644
- fi
- if test x$SUSE_KERNEL = xyes; then
+ elif test x$SUSE_KERNEL = xyes; then
- LDISKFS_SERIES="2.6-sles11.series"
+ LDISKFS_SERIES="2.6-sles11.series"
+ else
+ LDISKFS_SERIES="2.6.32-vanilla.series"
- fi
- ;;
- *)
+ fi
+ ;;
+ *)
--
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
