[Pkg-lustre-svn-commit] r431 - in /trunk/debian: patches/00list patches/autogen-run.dpatch patches/enable-quota.dpatch rules

Tue Feb 12 18:17:50 UTC 2008

Author: goswin-guest
Date: Tue Feb 12 18:17:50 2008
New Revision: 431

URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=431
Log:
Fix enable-quota.dpatch:
 - Add LC_CONFIG_QUOTA to configure.ac
 - Remove check for < 2.6 kernel from LC_CONFIG_QUOTA
Run autogen.sh at build time, remove huge patch.


Removed:
    trunk/debian/patches/autogen-run.dpatch
Modified:
    trunk/debian/patches/00list
    trunk/debian/patches/enable-quota.dpatch
    trunk/debian/rules

Modified: trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/00list?rev=431&op=diff
==============================================================================

--- trunk/debian/patches/00list (original)
+++ trunk/debian/patches/00list Tue Feb 12 18:17:50 2008
@@ -22,8 +22,5 @@
 fix-2.6.15-versioncheck.dpatch
 bug13852-quota_includes.dpatch
 bug6334-prevent_multiple_mounts.dpatch
-autogen-run.dpatch
 fix-lustre-manpage.dpatch
-
-#Quick hack to get quota working
 enable-quota.dpatch

Modified: trunk/debian/patches/enable-quota.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/enable-quota.dpatch?rev=431&op=diff
==============================================================================
--- trunk/debian/patches/enable-quota.dpatch (original)
+++ trunk/debian/patches/enable-quota.dpatch Tue Feb 12 18:17:50 2008
@@ -4,60 +4,27 @@
 ## DP: --enable-quota check was only run when building modules.
 
 @DPATCH@
---- ./configure	2004-12-20 00:06:24.000000000 +0100
-+++ ./configure	2007-10-10 13:06:56.161232534 +0200
-@@ -5096,6 +5096,25 @@
- fi
+diff -urNad lustre-1.6.4.2~/configure.ac lustre-1.6.4.2/configure.ac
+--- lustre-1.6.4.2~/configure.ac	2007-11-29 17:07:35.000000000 +0100
++++ lustre-1.6.4.2/configure.ac	2008-02-12 19:12:13.593610439 +0100
+@@ -8,6 +8,7 @@
+ LB_CHECK_VERSION
  
+ LC_CONFIG_SRCDIR
++LC_CONFIG_QUOTA
  
-+{ 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 @@
+ AC_CANONICAL_SYSTEM
  
- 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; }
+diff -urNad lustre-1.6.4.2~/lustre/autoconf/lustre-core.m4 lustre-1.6.4.2/lustre/autoconf/lustre-core.m4
+--- lustre-1.6.4.2~/lustre/autoconf/lustre-core.m4	2007-12-04 23:03:50.000000000 +0100
++++ lustre-1.6.4.2/lustre/autoconf/lustre-core.m4	2008-02-12 19:12:40.986431493 +0100
+@@ -1374,9 +1374,6 @@
+ 			[enable quota support]),
+ 	[],[enable_quota='yes'])
+ AC_MSG_RESULT([$enable_quota])
 -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.
+ if test x$enable_quota != xno; then
+    AC_DEFINE(HAVE_QUOTA_SUPPORT, 1, [Enable quota support])
+ fi

Modified: trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/rules?rev=431&op=diff
==============================================================================
--- trunk/debian/rules (original)
+++ trunk/debian/rules Tue Feb 12 18:17:50 2008
@@ -42,8 +42,13 @@
 #Build dir
 BUILDDIR=debian/build
 
+autogen: autogen-stamp
+autogen-stamp: patch-stamp
+	sh ./autogen.sh
+	touch $@
+
 configure: configure-stamp
-configure-stamp: patch-stamp debian/control
+configure-stamp: autogen-stamp debian/control
 	dh_testdir
 	# touch files to same date, to avoid auto*
 	find . -type f -exec touch -r COPYING {} \;
@@ -71,7 +76,7 @@
 	$(MAKE) -C $(BUILDDIR)
 	# The .pdf's don't get automatically built, so
 	HOME=$(TOP_DIR)/debian/build/lustre/doc $(MAKE) -C $(BUILDDIR)/lustre/doc lconf.pdf  lctl.pdf  lfs.pdf  lmc.pdf
-	# FIXME: $(BUILDDIR) isn't used
+	## FIXME: $(BUILDDIR) isn't used
 	mv lustre/doc/lconf.pdf lustre/doc/lctl.pdf lustre/doc/lfs.pdf lustre/doc/lmc.pdf $(BUILDDIR)/lustre/doc
 	$(MAKE) -C $(BUILDDIR) DESTDIR=$(TOP_DIR)/debian/tmp install
 	touch $@
@@ -251,7 +256,7 @@
 	dh_clean -k
 	$(MAKE) 
 	$(MAKE)  install DESTDIR=$(CURDIR)/debian/$(PKGNAME)
-	
+
 	# 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.


