[Pkg-lustre-svn-commit] r407 - in /trunk/debian: changelog patches/remove-fiemaph.dpatch rules

[winnie at users.alioth.debian.org]

Author: winnie
Date: Thu Dec 27 14:12:37 2007
New Revision: 407

URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=407
Log:
some fixes for 1.6.4.1 (e.g. fiemap.h)

Modified:
    trunk/debian/changelog
    trunk/debian/patches/remove-fiemaph.dpatch
    trunk/debian/rules

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/changelog?rev=407&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Thu Dec 27 14:12:37 2007
@@ -26,9 +26,13 @@
     (fix-lustre-manpage.dpatch)
   * Removed obsolete target from debian/rules
   * Fixed path issue of lc_common (lc_common in wrong path) Closes: #457287)
-  * Improved README.Debian a bit 
-
- -- Patrick Winnertz <winnie at debian.org>  Thu, 27 Dec 2007 12:12:10 +0100
+  * Improved README.Debian a bit
+  * Include fiemap.h on 2.6.18er kernels (remove-fiemaph.dpatch).
+  * Changed the klugde to get the modules into the right dir a bit, since .??
+    doesn't fit to kernels as 2.6.22.15 ... (replaced .?? with .*)
+  * Switched in rules to 1.6.4.1
+
+ -- Patrick Winnertz <winnie at debian.org>  Thu, 27 Dec 2007 14:47:12 +0100
 
 lustre (1.6.3-2) unstable; urgency=low
 

Modified: trunk/debian/patches/remove-fiemaph.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/remove-fiemaph.dpatch?rev=407&op=diff
==============================================================================
--- trunk/debian/patches/remove-fiemaph.dpatch (original)
+++ trunk/debian/patches/remove-fiemaph.dpatch Thu Dec 27 14:12:37 2007
@@ -5,15 +5,19 @@
 ## DP: fiemap.h doesn't exist in newer kernels
 
 @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 @@
+diff -urNad lustre-1.6.4.1~/ldiskfs/ldiskfs/Makefile.in lustre-1.6.4.1/ldiskfs/ldiskfs/Makefile.in
+--- lustre-1.6.4.1~/ldiskfs/ldiskfs/Makefile.in	2007-08-31 10:49:18.000000000 +0200
++++ lustre-1.6.4.1/ldiskfs/ldiskfs/Makefile.in	2007-12-27 14:46:32.000000000 +0100
+@@ -9,7 +9,11 @@
  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
++#This works only for 2.6.18.. older kernels won't work with this patch
++ifneq (,$(findstring 2.6.18, at LINUXRELEASE@))
++new_sources += fiemap.h
++endif
  new_headers := ext3_extents.h 
  ldiskfs_patched_sources := $(notdir $(ext3_sources) $(ext3_headers)) $(new_sources) $(new_headers)
  ldiskfs_sources := $(ldiskfs_patched_sources)

Modified: trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/rules?rev=407&op=diff
==============================================================================
--- trunk/debian/rules (original)
+++ trunk/debian/rules Thu Dec 27 14:12:37 2007
@@ -29,7 +29,7 @@
 TOP_DIR:=$(shell pwd)
 
 # Lustre version to use 
-VERSION=1.6.3
+VERSION=1.6.4.1
 SUPPORTED_KERNELS=2.6.18 2.6.20 2.6.22
 
 # Packages
@@ -255,7 +255,7 @@
 	# Kludge to make modules end up in the right place, UTSNAME only
 	# contains kernel version in 2.6.18 so lustre module install puts them
 	# in the wrong place currently.
-	-mv -f $(CURDIR)/debian/$(PKGNAME)/lib/modules/2.6.?? $(CURDIR)/debian/$(PKGNAME)/lib/modules/$(KVERS)
+	-mv -f $(CURDIR)/debian/$(PKGNAME)/lib/modules/2.6.* $(CURDIR)/debian/$(PKGNAME)/lib/modules/$(KVERS)
 	# Remove stuff that doesn't belong (no module-only target)
 	# FIXME: check if this is needed
 	cd $(CURDIR)/debian/$(PKGNAME) && rm -rf usr sbin etc