[Pkg-lustre-svn-commit] r384 - in /trunk/debian: changelog patches/00list patches/fix-mballoc3corepatch.dpatch patches/remove-fiemaph.dpatch

[pwinnertz-guest at users.alioth.debian.org]

Author: pwinnertz-guest
Date: Wed Nov 14 13:46:45 2007
New Revision: 384

URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=384
Log:
Fix 1.6.3 to work again

Added:
    trunk/debian/patches/fix-mballoc3corepatch.dpatch   (with props)
    trunk/debian/patches/remove-fiemaph.dpatch   (with props)
Modified:
    trunk/debian/changelog
    trunk/debian/patches/00list

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/changelog?rev=384&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Wed Nov 14 13:46:45 2007
@@ -13,6 +13,7 @@
   * Removed unneeded patches (this patches are included in the new release)
   * Include several patches from upstream bugzilla with some important fixes,
     which aren't addressed by the 1.6.3 release.
+  * Add patch to remove fiemap.h from new_sources list
 
   [ Noèl Köthe ]
   * adding author and date of debian/TODO

Modified: trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/00list?rev=384&op=diff
==============================================================================
--- trunk/debian/patches/00list (original)
+++ trunk/debian/patches/00list Wed Nov 14 13:46:45 2007
@@ -14,6 +14,7 @@
 bug13438-fix-mballoc-bogus-BUGON.dpatch
 remove-set_tunables.dpatch
 libsysio.dpatch
+remove-fiemaph.dpatch
 
 # Debian patches
 bash_completion.dpatch
@@ -28,7 +29,7 @@
 bug13696-lru_resize_mount_opts+perf_test.dpatch
 bug6334-prevent_multiple_mounts.dpatch
 autogen-run.dpatch
-
+fix-mballoc3corepatch.dpatch
 
 #Work needing patches
 #autogen-run.dpatch

Added: trunk/debian/patches/fix-mballoc3corepatch.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/fix-mballoc3corepatch.dpatch?rev=384&op=file
==============================================================================
--- trunk/debian/patches/fix-mballoc3corepatch.dpatch (added)
+++ trunk/debian/patches/fix-mballoc3corepatch.dpatch Wed Nov 14 13:46:45 2007
@@ -1,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-mballoc3corepatch.dpatch by Patrick Winnertz <patrick.winnertz at credativ.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: strange error.. some fix
+
+ at DPATCH@
+diff -urNad lustre-1.6.3~/ldiskfs/kernel_patches/patches/ext3-mballoc3-core.patch lustre-1.6.3/ldiskfs/kernel_patches/patches/ext3-mballoc3-core.patch
+--- lustre-1.6.3~/ldiskfs/kernel_patches/patches/ext3-mballoc3-core.patch	2007-11-14 12:52:46.000000000 +0100
++++ lustre-1.6.3/ldiskfs/kernel_patches/patches/ext3-mballoc3-core.patch	2007-11-14 12:53:43.000000000 +0100
+@@ -183,7 +183,7 @@
+ ===================================================================
+ --- linux-2.6.9-full.orig/fs/ext3/mballoc.c	2007-07-14 04:24:39.138985848 +0400
+ +++ linux-2.6.9-full/fs/ext3/mballoc.c	2007-07-20 11:31:03.000000000 +0400
+-@@ -0,0 +1,4393 @@
++@@ -0,0 +1,4394 @@
+ +/*
+ + * Copyright (c) 2003-2006, Cluster File Systems, Inc, info at clusterfs.com
+ + * Written by Alex Tomas <alex at clusterfs.com>
+@@ -4578,3 +4578,4 @@
+ +	ext3_std_error(sb, err);
+ +	return;
+ +}
+++ 

Propchange: trunk/debian/patches/fix-mballoc3corepatch.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: trunk/debian/patches/remove-fiemaph.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/remove-fiemaph.dpatch?rev=384&op=file
==============================================================================
--- trunk/debian/patches/remove-fiemaph.dpatch (added)
+++ trunk/debian/patches/remove-fiemaph.dpatch Wed Nov 14 13:46:45 2007
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## remove-fiemaph.dpatch by Patrick Winnertz <patrick.winnertz at credativ.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fiemap.h doesn't exist in newer kernels
+
+ at DPATCH@
+diff -urNad lustre-1.6.3~/ldiskfs/ldiskfs/Makefile.in lustre-1.6.3/ldiskfs/ldiskfs/Makefile.in
+--- lustre-1.6.3~/ldiskfs/ldiskfs/Makefile.in	2007-08-31 10:49:18.000000000 +0200
++++ lustre-1.6.3/ldiskfs/ldiskfs/Makefile.in	2007-11-14 11:58:53.000000000 +0100
+@@ -9,7 +9,7 @@
+ linux_headers := $(wildcard @LINUX@/include/linux/ext3*.h)
+ 
+ ext3_sources := $(filter-out %.mod.c,$(wildcard @LINUX@/fs/ext3/*.c))
+-new_sources := iopen.c iopen.h extents.c mballoc.c group.h fiemap.h
++new_sources := iopen.c iopen.h extents.c mballoc.c group.h
+ new_headers := ext3_extents.h 
+ ldiskfs_patched_sources := $(notdir $(ext3_sources) $(ext3_headers)) $(new_sources) $(new_headers)
+ ldiskfs_sources := $(ldiskfs_patched_sources)

Propchange: trunk/debian/patches/remove-fiemaph.dpatch
------------------------------------------------------------------------------
    svn:executable = *