The following commit has been merged in the master branch:
commit c02f9ea39a62b8e2aee3dd50d1fb8c18e4cfec3a
Author: Marco Nelles <marco.nel...@credativ.de>
Date:   Tue Jul 3 14:56:06 2012 +0200

    Removed ldisk detect patch

diff --git a/debian/patches/ldiskfs-detect-2.6.32.patch 
b/debian/patches/ldiskfs-detect-2.6.32.patch
deleted file mode 100644
index cd29b10..0000000
--- a/debian/patches/ldiskfs-detect-2.6.32.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/debian/patches/ldiskfs-detect-2.6.32.patch 
b/debian/patches/ldiskfs-detect-2.6.32.patch
-index 5412a6d..1f848ff 100644
---- a/debian/patches/ldiskfs-detect-2.6.32.patch
-+++ b/debian/patches/ldiskfs-detect-2.6.32.patch
-@@ -1,12 +1,33 @@
--diff --git a/ldiskfs/aclocal.m4 b/ldiskfs/aclocal.m4
--index d17e63a..f50ee31 100644
----- a/ldiskfs/aclocal.m4
--+++ b/ldiskfs/aclocal.m4
--@@ -1432,9 +1432,10 @@ if $1; then
--      2.6.32*)
-+diff --git a/debian/patches/ldiskfs-detect-2.6.32.patch 
b/debian/patches/ldiskfs-detect-2.6.32.patch
-+index 5412a6d..e69de29 100644
-+--- a/debian/patches/ldiskfs-detect-2.6.32.patch
-++++ b/debian/patches/ldiskfs-detect-2.6.32.patch
-+@@ -1,17 +0,0 @@
-+-diff --git a/ldiskfs/aclocal.m4 b/ldiskfs/aclocal.m4
-+-index d17e63a..f50ee31 100644
-+---- a/ldiskfs/aclocal.m4
-+-+++ b/ldiskfs/aclocal.m4
-+-@@ -1432,9 +1432,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/configure b/ldiskfs/configure
-+index a0e88f5..7b7bef6 100755
-+--- a/ldiskfs/configure
-++++ b/ldiskfs/configure
-+@@ -6311,8 +6311,10 @@ $as_echo_n "checking which ldiskfs series to use... " 
>&6; }
-               if test x$RHEL_KERNEL = xyes; then
-                       LDISKFS_SERIES="2.6-rhel6.series"
---             fi
-+              fi
- -             if test x$SUSE_KERNEL = xyes; then
- +             elif test x$SUSE_KERNEL = xyes; then
-                       LDISKFS_SERIES="2.6-sles11.series"
-diff --git a/ldiskfs/configure b/ldiskfs/configure
-index a0e88f5..7b7bef6 100755
---- a/ldiskfs/configure
-+++ b/ldiskfs/configure
-@@ -6311,8 +6311,10 @@ $as_echo_n "checking which ldiskfs series to use... " 
>&6; }
-               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/debian/patches/series b/debian/patches/series
index 394bfaa..bcb81f5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,6 +15,5 @@ fix-oot-builds.patch
 no-strict-aliasing.patch
 fix-bashisms-for-dash.patch
 cacheflush-remove-mark-rodata.patch
-ldiskfs-detect-2.6.32.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