X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=debian%2Frules;h=d504f8789a898952e8615c7039bbecc813c90361;hb=22b3aa933a155e37bb7ee1e4dde6f3704d30b67f;hp=a3e854179dfd7ff82b3816e8219bff0ce484609f;hpb=63e8a95e9ccea7e9265ba96718f6da21ddfba1e5;p=fs%2Flustre-release.git

diff --git a/debian/rules b/debian/rules
index a3e8541..d504f87 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,8 +89,13 @@ autogen-stamp: patch-stamp
 	#  needed autogen.sh scripts
 	#  see https://bugzilla.lustre.org/attachment.cgi?id=27156
 	#  for an example)
-	if grep "^--- .*\/autoconf" debian/patches/*; then \
-		if [ ! -f autogen.sh ]; 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"; \
 			exit 1; \
@@ -101,7 +106,7 @@ autogen-stamp: patch-stamp
 		cp /usr/share/misc/config.guess config.guess; \
 		cp /usr/share/misc/config.guess libsysio/config.guess; \
 		cp /usr/share/misc/config.guess ldiskfs/config.guess; \
-		sh ./autogen.sh; \
+		sh build/autogen.sh; \
 	fi; \
 	touch $@
 
@@ -356,6 +361,7 @@ 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  \
@@ -393,7 +399,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 +414,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