[Pkg-lustre-svn-commit] updated: [c18e468] Rediffed ldiskfs-detect patch as we need it to build debian kernels

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit c18e468383e6b0511aa8a31495d071d200b537e5
Author: Patrick Winnertz <winnie at debian.org>
Date:   Thu Aug 13 11:19:08 2009 +0200

    Rediffed ldiskfs-detect patch as we need it to build debian kernels
    
    Signed-off-by: Patrick Winnertz <winnie at debian.org>

diff --git a/debian/patches/00list b/debian/patches/00list
index a598179..104babf 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -3,7 +3,7 @@ page-size-undef-fixes.dpatch
 inode-no-i_blksize-2.6.20.dpatch
 posix_acl.dpatch
 2.6.21-mds-orphan_link.dpatch
-#ldiskfs-detect-2.6.20-2.6.22.dpatch
+ldiskfs-detect-2.6.20-2.6.22.dpatch
 no_default_debugging.dpatch
 autogen.sh.dpatch
 no-darwin.dpatch
diff --git a/debian/patches/ldiskfs-detect-2.6.20-2.6.22.dpatch b/debian/patches/ldiskfs-detect-2.6.20-2.6.22.dpatch
index 89c5158..e83c623 100755
--- a/debian/patches/ldiskfs-detect-2.6.20-2.6.22.dpatch
+++ b/debian/patches/ldiskfs-detect-2.6.20-2.6.22.dpatch
@@ -5,24 +5,20 @@
 ## DP: Patch from Q-Leap Networks modified by Patrick winnertz <patrick.winnertz at credativ.de>
 
 @DPATCH@
-diff -urNad lustre-1.6.5~rc2~/ldiskfs/configure.ac lustre-1.6.5~rc2/ldiskfs/configure.ac
---- lustre-1.6.5~rc2~/ldiskfs/configure.ac	2008-04-24 10:28:16.000000000 +0200
-+++ lustre-1.6.5~rc2/ldiskfs/configure.ac	2008-05-09 14:21:18.000000000 +0200
-@@ -95,11 +95,15 @@
- 2.6.18*)
- 	if test x$RHEL_KENEL = xyes; then
- 		LDISKFS_SERIES="2.6-rhel5.series"
+diff -urNad lustre~/ldiskfs/configure.ac lustre/ldiskfs/configure.ac
+--- lustre~/ldiskfs/configure.ac	2009-08-13 11:31:22.000000000 +0200
++++ lustre/ldiskfs/configure.ac	2009-08-13 11:32:19.000000000 +0200
+@@ -135,8 +135,12 @@
+                 else
+ 		        LDISKFS_SERIES="2.6-rhel5.series"
+                 fi
 -	else
--		LDISKFS_SERIES="2.6.18-vanilla.series"
-+	else if test -e $LINUX_OBJ/version.Debian; then
-+            LDISKFS_SERIES="2.6.18-debian.series"
-+        else
-+		    LDISKFS_SERIES="2.6.18-vanilla.series"
++	else 
++	    if test -e $LINUX_OBJ/version.Debian; then
++		LDISKFS_SERIES="2.6.18-debian.series"
++	    else
+ 		LDISKFS_SERIES="2.6.18-vanilla.series"
 +	    fi
  	fi
  	;;
  2.6.22*) LDISKFS_SERIES="2.6.22-vanilla.series";;
-+2.6.23*) LDISKFS_SERIES="2.6.23-vanilla.series";;
- *) AC_MSG_WARN([Unknown kernel version $LINUXRELEASE, fix ldiskfs/configure.ac])
- esac
- AC_MSG_RESULT([$LDISKFS_SERIES])

-- 
Lustre Debian Packaging