X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=debian%2Frules;h=aecb8fd4b4d502e5e1ec244653d2b7e352d5e047;hb=ab486a558bde3af6bd75f7fc38bd06042ed5ef67;hp=06ef5af6b7ef500a63797ffcb250402c92d130b6;hpb=b635501547739ba4db2225e7263069a70d4a71cb;p=fs%2Flustre-release.git

diff --git a/debian/rules b/debian/rules
index 06ef5af..aecb8fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,7 +89,12 @@ autogen-stamp: patch-stamp
 	#  needed autogen.sh scripts
 	#  see https://bugzilla.lustre.org/attachment.cgi?id=27156
 	#  for an example)
-	if grep -e "^--- .*\/autoconf" -e ".*\/configure\.ac" -e ".*\/configure\.in" debian/patches/*; then \
+	if grep -e "^--- .*\/autoconf\/" \
+		-e "^--- .*\/autoMakefile\.am" \
+		-e "^--- .*\/Makefile\.am" \
+		-e "^--- .*\/configure\.ac" \
+		-e "^--- .*\/configure\.in" \
+	    debian/patches/*; then \
 		if [ ! -f build/autogen.sh ]; then \
 			echo "You have patches which require autogen.sh to be run, but it doesn't exist"; \
 			echo "Please see https://bugzilla.lustre.org/attachment.cgi?id=27156"; \
@@ -356,18 +361,18 @@ kdist_config: prep-deb-files patch-stamp
 	find . -type f -print0 | xargs -0 touch -r COPYING \;
 	# Doesn't seem possible to only build modules...
 	./configure --with-linux=$(KSRC) \
+	            --disable-server \
 		    --disable-quilt  \
 		    --disable-dependency-tracking \
 		    --disable-doc  \
 		    --disable-utils \
 		    --disable-liblustre \
 		    --disable-snmp \
-		    --enable-ldiskfs \
 		    --disable-zerocopy \
 		    --disable-tests \
 		    --enable-quota
 
-kdist_configure: kdist_config 
+kdist_configure: kdist_config
 
 # the binary-modules rule is invoked by module-assistant while processing the
 # kdist* targets. It is called by module-assistant or make-kpkg and *not*
@@ -393,7 +398,7 @@ binary-modules: prep-deb-files
 clean:
 	dh_testdir
 	dh_testroot
-	dpatch deapply-all
+	dpatch deapply-all -v
 	-$(MAKE) distclean
 	rm -rf  debian/substvars debian/*.bak debian/*~ *~  *-stamp debian/$(PATCH_PKG)
 	ls -d debian/lustre-client-modules-* | grep -v _KVERS_ | xargs rm -f || true
@@ -408,11 +413,11 @@ clean:
 
 patch: patch-stamp
 patch-stamp:
-	dpatch apply-all
+	dpatch apply-all -v
 	touch $@
 
 unpatch:
-	dpatch deapply-all
+	dpatch deapply-all -v
 	rm -rf debian/patched patch-stamp
 
 .PHONY: binary-arch clean source diff  binary binary-indep binary-arch install configure