[Pkg-lustre-svn-commit] r293 - in /trunk/debian/patches: 00list ldiskfs-2.6.22-no-group.h.dpatch

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

Author: goswin-guest
Date: Fri Sep  7 13:17:04 2007
New Revision: 293

URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=293
Log:
2.6.22 has no group.h, skip it there.


Added:
    trunk/debian/patches/ldiskfs-2.6.22-no-group.h.dpatch   (with props)
Modified:
    trunk/debian/patches/00list

Modified: trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/00list?rev=293&op=diff
==============================================================================
--- trunk/debian/patches/00list (original)
+++ trunk/debian/patches/00list Fri Sep  7 13:17:04 2007
@@ -19,6 +19,7 @@
 2.6.22_scheduler.dpatch
 bug13030_nfs.dpatch
 ldiskfs-detect-2.6.20-2.6.22.dpatch
+ldiskfs-2.6.22-no-group.h.dpatch
 no_default_debugging.patch
 
 # Debian patches

Added: trunk/debian/patches/ldiskfs-2.6.22-no-group.h.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/ldiskfs-2.6.22-no-group.h.dpatch?rev=293&op=file
==============================================================================
--- trunk/debian/patches/ldiskfs-2.6.22-no-group.h.dpatch (added)
+++ trunk/debian/patches/ldiskfs-2.6.22-no-group.h.dpatch Fri Sep  7 13:17:04 2007
@@ -1,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ldiskfs-2.6.22-no-group.h.dpatch by Goswin von Brederlow <brederlo at informatik.uni-tuebingen.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch from Q-Leap Networks
+## DP: 2.6.22 has no group.h file so skip it there
+
+ at DPATCH@
+diff -urNad lustre-1.6.2~/ldiskfs/ldiskfs/Makefile.in lustre-1.6.2/ldiskfs/ldiskfs/Makefile.in
+--- lustre-1.6.2~/ldiskfs/ldiskfs/Makefile.in	2007-06-14 08:47:59.000000000 +0200
++++ lustre-1.6.2/ldiskfs/ldiskfs/Makefile.in	2007-09-07 14:48:51.252277823 +0200
+@@ -9,7 +9,10 @@
+ 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
++new_sources := iopen.c iopen.h extents.c mballoc.c
++ifeq (,$(findstring 2.6.22, at LINUXRELEASE@))
++new_sources += group.h
++endif
+ 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/ldiskfs-2.6.22-no-group.h.dpatch
------------------------------------------------------------------------------
    svn:executable = *