[Pkg-lustre-svn-commit] r355 - in /trunk/debian: changelog patches/00list patches/fix-2.6.15-versioncheck.dpatch patches/quota-configure.dpatch patches/quota-includes.dpatch
pwinnertz-guest at users.alioth.debian.org
pwinnertz-guest at users.alioth.debian.org
Wed Oct 10 14:14:21 UTC 2007
Author: pwinnertz-guest
Date: Wed Oct 10 14:14:20 2007
New Revision: 355
URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=355
Log:
Added some patches for quota handling
Added:
trunk/debian/patches/fix-2.6.15-versioncheck.dpatch
trunk/debian/patches/quota-configure.dpatch
trunk/debian/patches/quota-includes.dpatch
Modified:
trunk/debian/changelog
trunk/debian/patches/00list
Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/changelog?rev=355&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Wed Oct 10 14:14:20 2007
@@ -5,8 +5,10 @@
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
- -- Patrick Winnertz <patrick.winnertz at skolelinux.org> Wed, 10 Oct 2007 14:13:54 +0200
+ -- Patrick Winnertz <patrick.winnertz at skolelinux.org> Wed, 10 Oct 2007 16:14:07 +0200
lustre (1.6.2-3) unstable; urgency=low
Modified: trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/00list?rev=355&op=diff
==============================================================================
--- trunk/debian/patches/00list (original)
+++ trunk/debian/patches/00list Wed Oct 10 14:14:20 2007
@@ -30,6 +30,5 @@
autogen-run.dpatch
lustre_config.dpatch
-
#discuss needed
#bug12644-fix-FIEMAP.dpatch
Added: trunk/debian/patches/fix-2.6.15-versioncheck.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/fix-2.6.15-versioncheck.dpatch?rev=355&op=file
==============================================================================
--- trunk/debian/patches/fix-2.6.15-versioncheck.dpatch (added)
+++ trunk/debian/patches/fix-2.6.15-versioncheck.dpatch Wed Oct 10 14:14:20 2007
@@ -1,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-2.6.15-versioncheck.dpatch by Niklas Edmundsson <Niklas.Edmundsson at hpc2n.umu.se>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix version-check for 2.6.15 ubuntu/vanilla kernel.
+## DP: Upstream check assumes RedHat patched kernel.
+
+ at DPATCH@
+
+diff lustre-1.6.2/lustre/include/linux/lustre_compat25.h lustre-1.6.2/lustre/include/linux/lustre_compat25.h
+--- lustre-1.6.2/lustre/include/linux/lustre_compat25.h (revision 135)
++++ lustre-1.6.2/lustre/include/linux/lustre_compat25.h (working copy)
+@@ -75,7 +75,7 @@
+ #define TRYLOCK_INODE_MUTEX(inode) (!down_trylock(&(inode)->i_sem))
+ #endif /* HAVE_INODE_I_MUTEX */
+
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
+ #define d_child d_u.d_child
+ #define d_rcu d_u.d_rcu
+ #endif
Added: trunk/debian/patches/quota-configure.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/quota-configure.dpatch?rev=355&op=file
==============================================================================
--- trunk/debian/patches/quota-configure.dpatch (added)
+++ trunk/debian/patches/quota-configure.dpatch Wed Oct 10 14:14:20 2007
@@ -1,0 +1,189 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: --enable-quota check was only run when building modules.
+
+ at DPATCH@
+--- ./configure 2004-12-20 00:06:24.000000000 +0100
++++ ./configure 2007-10-10 13:06:56.161232534 +0200
+@@ -5096,6 +5096,25 @@
+ fi
+
+
++{ echo "$as_me:$LINENO: checking whether to enable quota support" >&5
++echo $ECHO_N "checking whether to enable quota support... $ECHO_C" >&6; }
++# Check whether --enable-quota was given.
++if test "${enable_quota+set}" = set; then
++ enableval=$enable_quota;
++else
++ enable_quota='yes'
++fi
++
++{ echo "$as_me:$LINENO: result: $enable_quota" >&5
++echo "${ECHO_T}$enable_quota" >&6; }
++if test x$enable_quota != xno; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_QUOTA_SUPPORT 1
++_ACEOF
++
++fi
++
+ { echo "$as_me:$LINENO: checking whether to build kernel modules" >&5
+ echo $ECHO_N "checking whether to build kernel modules... $ECHO_C" >&6; }
+ # Check whether --enable-modules was given.
+@@ -8315,28 +8334,6 @@
+
+ fi
+
+-{ echo "$as_me:$LINENO: checking whether to enable quota support" >&5
+-echo $ECHO_N "checking whether to enable quota support... $ECHO_C" >&6; }
+-# Check whether --enable-quota was given.
+-if test "${enable_quota+set}" = set; then
+- enableval=$enable_quota;
+-else
+- enable_quota='yes'
+-fi
+-
+-{ echo "$as_me:$LINENO: result: $enable_quota" >&5
+-echo "${ECHO_T}$enable_quota" >&6; }
+-if test x$linux25 != xyes; then
+- enable_quota='no'
+-fi
+-if test x$enable_quota != xno; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_QUOTA_SUPPORT 1
+-_ACEOF
+-
+-fi
+-
+ { echo "$as_me:$LINENO: checking whether to enable a write with the health check" >&5
+ echo $ECHO_N "checking whether to enable a write with the health check... $ECHO_C" >&6; }
+ # Check whether --enable-health-write was given.
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: --enable-quota check was only run when building modules.
+
+ at DPATCH@
+--- ./configure 2004-12-20 00:06:24.000000000 +0100
++++ ./configure 2007-10-10 13:06:56.161232534 +0200
+@@ -5096,6 +5096,25 @@
+ fi
+
+
++{ echo "$as_me:$LINENO: checking whether to enable quota support" >&5
++echo $ECHO_N "checking whether to enable quota support... $ECHO_C" >&6; }
++# Check whether --enable-quota was given.
++if test "${enable_quota+set}" = set; then
++ enableval=$enable_quota;
++else
++ enable_quota='yes'
++fi
++
++{ echo "$as_me:$LINENO: result: $enable_quota" >&5
++echo "${ECHO_T}$enable_quota" >&6; }
++if test x$enable_quota != xno; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_QUOTA_SUPPORT 1
++_ACEOF
++
++fi
++
+ { echo "$as_me:$LINENO: checking whether to build kernel modules" >&5
+ echo $ECHO_N "checking whether to build kernel modules... $ECHO_C" >&6; }
+ # Check whether --enable-modules was given.
+@@ -8315,28 +8334,6 @@
+
+ fi
+
+-{ echo "$as_me:$LINENO: checking whether to enable quota support" >&5
+-echo $ECHO_N "checking whether to enable quota support... $ECHO_C" >&6; }
+-# Check whether --enable-quota was given.
+-if test "${enable_quota+set}" = set; then
+- enableval=$enable_quota;
+-else
+- enable_quota='yes'
+-fi
+-
+-{ echo "$as_me:$LINENO: result: $enable_quota" >&5
+-echo "${ECHO_T}$enable_quota" >&6; }
+-if test x$linux25 != xyes; then
+- enable_quota='no'
+-fi
+-if test x$enable_quota != xno; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_QUOTA_SUPPORT 1
+-_ACEOF
+-
+-fi
+-
+ { echo "$as_me:$LINENO: checking whether to enable a write with the health check" >&5
+ echo $ECHO_N "checking whether to enable a write with the health check... $ECHO_C" >&6; }
+ # Check whether --enable-health-write was given.
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: --enable-quota check was only run when building modules.
+
+ at DPATCH@
+--- ./configure 2004-12-20 00:06:24.000000000 +0100
++++ ./configure 2007-10-10 13:06:56.161232534 +0200
+@@ -5096,6 +5096,25 @@
+ fi
+
+
++{ echo "$as_me:$LINENO: checking whether to enable quota support" >&5
++echo $ECHO_N "checking whether to enable quota support... $ECHO_C" >&6; }
++# Check whether --enable-quota was given.
++if test "${enable_quota+set}" = set; then
++ enableval=$enable_quota;
++else
++ enable_quota='yes'
++fi
++
++{ echo "$as_me:$LINENO: result: $enable_quota" >&5
++echo "${ECHO_T}$enable_quota" >&6; }
++if test x$enable_quota != xno; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_QUOTA_SUPPORT 1
++_ACEOF
++
++fi
++
+ { echo "$as_me:$LINENO: checking whether to build kernel modules" >&5
+ echo $ECHO_N "checking whether to build kernel modules... $ECHO_C" >&6; }
+ # Check whether --enable-modules was given.
+@@ -8315,28 +8334,6 @@
+
+ fi
+
+-{ echo "$as_me:$LINENO: checking whether to enable quota support" >&5
+-echo $ECHO_N "checking whether to enable quota support... $ECHO_C" >&6; }
+-# Check whether --enable-quota was given.
+-if test "${enable_quota+set}" = set; then
+- enableval=$enable_quota;
+-else
+- enable_quota='yes'
+-fi
+-
+-{ echo "$as_me:$LINENO: result: $enable_quota" >&5
+-echo "${ECHO_T}$enable_quota" >&6; }
+-if test x$linux25 != xyes; then
+- enable_quota='no'
+-fi
+-if test x$enable_quota != xno; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_QUOTA_SUPPORT 1
+-_ACEOF
+-
+-fi
+-
+ { echo "$as_me:$LINENO: checking whether to enable a write with the health check" >&5
+ echo $ECHO_N "checking whether to enable a write with the health check... $ECHO_C" >&6; }
+ # Check whether --enable-health-write was given.
Added: trunk/debian/patches/quota-includes.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/quota-includes.dpatch?rev=355&op=file
==============================================================================
--- trunk/debian/patches/quota-includes.dpatch (added)
+++ trunk/debian/patches/quota-includes.dpatch Wed Oct 10 14:14:20 2007
@@ -1,0 +1,48 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Missing include of sys/quota.h
+
+ at DPATCH@
+--- ./lustre/include/liblustre.h 2007-08-13 19:31:56.000000000 +0200
++++ ./lustre/include/liblustre.h 2007-10-10 11:38:20.071254030 +0200
+@@ -50,6 +50,7 @@
+ #ifndef _IOWR
+ # include "ioctl.h"
+ #endif
++#include <sys/quota.h>
+
+ #include <stdio.h>
+ #include <sys/ioctl.h>
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Missing include of sys/quota.h
+
+ at DPATCH@
+--- ./lustre/include/liblustre.h 2007-08-13 19:31:56.000000000 +0200
++++ ./lustre/include/liblustre.h 2007-10-10 11:38:20.071254030 +0200
+@@ -50,6 +50,7 @@
+ #ifndef _IOWR
+ # include "ioctl.h"
+ #endif
++#include <sys/quota.h>
+
+ #include <stdio.h>
+ #include <sys/ioctl.h>
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Missing include of sys/quota.h
+
+ at DPATCH@
+--- ./lustre/include/liblustre.h 2007-08-13 19:31:56.000000000 +0200
++++ ./lustre/include/liblustre.h 2007-10-10 11:38:20.071254030 +0200
+@@ -50,6 +50,7 @@
+ #ifndef _IOWR
+ # include "ioctl.h"
+ #endif
++#include <sys/quota.h>
+
+ #include <stdio.h>
+ #include <sys/ioctl.h>
More information about the Pkg-lustre-svn-commit
mailing list