[Pkg-lustre-svn-commit] r360 - in /trunk/debian: changelog patches/00list patches/liblustre-makefile.dpatch rules

Fri Oct 12 09:20:00 UTC 2007

Author: pwinnertz-guest
Date: Fri Oct 12 09:20:00 2007
New Revision: 360

URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=360
Log:
start to switch to 1.6.3

Added:
    trunk/debian/patches/liblustre-makefile.dpatch
Modified:
    trunk/debian/changelog
    trunk/debian/patches/00list
    trunk/debian/rules

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/changelog?rev=360&op=diff
==============================================================================

--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Fri Oct 12 09:20:00 2007
@@ -1,12 +1,15 @@
-lustre (1.6.2-4) UNRELEASED; urgency=low
+lustre (1.6.3-1) UNRELEASED; urgency=low
 
   [ Patrick Winnertz ]
+  * New upstream version
   * Added klugde from Niklas again, in order to install the modules into
     the right directory.
   * Added patches for bug 13438 & 13614 (from upstream bugzilla) to
     debian/patches.
   * Added patch from Niklas to fix ubuntu specific thing
   * Added patches to compile with --enable-quota
+     + FIXME: configure patch is a _very_ ugly hack
+  * Fix ftbfs due to a missing include (liblustre-makefile.dpatch)
 
  -- Patrick Winnertz <patrick.winnertz at skolelinux.org>  Wed, 10 Oct 2007 16:14:07 +0200
 

Modified: trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/00list?rev=360&op=diff
==============================================================================
--- trunk/debian/patches/00list (original)
+++ trunk/debian/patches/00list Fri Oct 12 09:20:00 2007
@@ -2,36 +2,37 @@
 lustre_manpage.dpatch
 
 # QL patches
-page-size-undef-fixes.dpatch
-libsysio.dpatch
-inode-no-i_blksize-2.6.20.dpatch
-bug12475_EXT3_IOC_fix_redefinition
-posix_acl.dpatch
-2.6.21-mds-orphan_link.dpatch
-2.6.22_ib.dpatch
-2.6.22_signal.dpatch
-2.6.22_scheduler.dpatch
-ldiskfs-detect-2.6.20-2.6.22.dpatch
-no_default_debugging.dpatch
-no-m64.dpatch
-autogen.sh.dpatch
+#page-size-undef-fixes.dpatch
+#libsysio.dpatch
+#inode-no-i_blksize-2.6.20.dpatch
+#bug12475_EXT3_IOC_fix_redefinition
+#posix_acl.dpatch
+#2.6.21-mds-orphan_link.dpatch
+#2.6.22_ib.dpatch
+#2.6.22_signal.dpatch
+#2.6.22_scheduler.dpatch
+#ldiskfs-detect-2.6.20-2.6.22.dpatch
+#no_default_debugging.dpatch
+#no-m64.dpatch
+#autogen.sh.dpatch
 tex2pdf.dpatch
-2.6.21-sysctl.dpatch
-bug12691-fixtypos.dpatch
-bug12567-fix-ldlm_cli_enqueue-errormsg.dpatch
-bug12704-fix-2tb-ost-corruption.dpatch
-bug13030-fix-nfs-export-norootsquash.dpatch
-bug12052-fix-loopin_lsm_lmm_verify_common.dpatch
-bug12627-fix-lfs-listnotonlyfiles.dpatch
-bug13438-fix-mballoc-bogus-BUGON.dpatch
-bug13614-kludge-stop-resend.dpatch
+#2.6.21-sysctl.dpatch
+#bug12691-fixtypos.dpatch
+#bug12567-fix-ldlm_cli_enqueue-errormsg.dpatch
+#bug12704-fix-2tb-ost-corruption.dpatch
+#bug13030-fix-nfs-export-norootsquash.dpatch
+#bug12052-fix-loopin_lsm_lmm_verify_common.dpatch
+#bug12627-fix-lfs-listnotonlyfiles.dpatch
+#bug13438-fix-mballoc-bogus-BUGON.dpatch
+#bug13614-kludge-stop-resend.dpatch
 
 # Debian patches
-autogen-run.dpatch
-lustre_config.dpatch
-fix-2.6.15-versioncheck.dpatch
+liblustre-makefile.dpatch
+#autogen-run.dpatch
+#lustre_config.dpatch
+#fix-2.6.15-versioncheck.dpatch
 quota-includes.dpatch
-quota-configure.dpatch
+#quota-configure.dpatch
 
 #discuss needed
 #bug12644-fix-FIEMAP.dpatch

Added: trunk/debian/patches/liblustre-makefile.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/liblustre-makefile.dpatch?rev=360&op=file
==============================================================================
--- trunk/debian/patches/liblustre-makefile.dpatch (added)
+++ trunk/debian/patches/liblustre-makefile.dpatch Fri Oct 12 09:20:00 2007
@@ -1,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## autogen.dpatch by Patrick Winnertz <patrick.winnertz at skolelinux.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: correct include path for libsysio since includes weren't found
+
+ at DPATCH@
+--- lustre-1.6.3.orig/lustre/liblustre/Makefile.in
++++ lustre-1.6.3/lustre/liblustre/Makefile.in
+@@ -273,7 +273,7 @@
+ target_vendor = @target_vendor@
+ SUBDIRS = . tests
+ 
+-AM_CPPFLAGS = $(HAVE_EFENCE) -I$(SYSIO)/include -D_LARGEFILE64_SOURCE=1 \
++AM_CPPFLAGS = $(HAVE_EFENCE) -I$(top_srcdir)/libsysio/include -D_LARGEFILE64_SOURCE=1 \
+               $(LLCPPFLAGS) -I$(top_srcdir)/lnet/ulnds
+ 
+ AM_CFLAGS = $(LLCFLAGS)

Modified: trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/rules?rev=360&op=diff
==============================================================================
--- trunk/debian/rules (original)
+++ trunk/debian/rules Fri Oct 12 09:20:00 2007
@@ -28,8 +28,8 @@
 ARCH=$(shell dpkg --print-architecture)
 TOP_DIR:=$(shell pwd)
 
-# Lustre version to use
-VERSION=1.6.2
+# Lustre version to use 
+VERSION=1.6.3
 SUPPORTED_KERNELS=2.6.18 2.6.20 2.6.22
 
 # Packages
@@ -57,7 +57,6 @@
 		   --enable-snmp \
 		   --disable-tests \
 		   --disable-client \
-		   --enable-quota
 		   --disable-server  )
 	# Correct tex2pdf mode.
 	chmod 744 lustre/doc/tex2pdf


