From: jacob <jacob>
Date: Wed, 27 Apr 2005 00:57:09 +0000 (+0000)
Subject: fix non-quilt build
X-Git-Tag: v1_7_100~1402
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=59dc41c31a551cf4aea24a99cfabad8fc35c5a74

fix non-quilt build
---

diff --git a/ldiskfs/ldiskfs/autoMakefile.am b/ldiskfs/ldiskfs/autoMakefile.am
index 4fd32d4..7c68d87 100644
--- a/ldiskfs/ldiskfs/autoMakefile.am
+++ b/ldiskfs/ldiskfs/autoMakefile.am
@@ -35,15 +35,16 @@ sources: $(ext3_sources) $(ext3_headers) $(linux_headers) $(series)
 	mkdir -p linux-stage/fs/ext3 linux-stage/include/linux
 	cp $(ext3_sources) $(ext3_headers) $(ext3_extra) linux-stage/fs/ext3
 	cp $(linux_headers) linux-stage/include/linux
-	cd linux-stage && quilt push -a -q
 if USE_QUILT
 	cd linux-stage && quilt setup -l ../$(series) -d ../$(patches)
 	cd linux-stage && quilt push -a -q
 else
+	@echo -n "Applying ext3 patches:"
 	@cd linux-stage && for i in $$(<../$(series)) ; do \
-               echo "patch -p1 < ../$(patches)/$$i" ; \
-               patch -p1 < ../$(patches)/$$i || exit 1 ; \
+               echo -n " $$i" ; \
+               patch -s -p1 < ../$(patches)/$$i || exit 1 ; \
 	done
+	@echo
 endif
 
 	mkdir linux
diff --git a/lustre/ldiskfs/autoMakefile.am b/lustre/ldiskfs/autoMakefile.am
index 4fd32d4..7c68d87 100644
--- a/lustre/ldiskfs/autoMakefile.am
+++ b/lustre/ldiskfs/autoMakefile.am
@@ -35,15 +35,16 @@ sources: $(ext3_sources) $(ext3_headers) $(linux_headers) $(series)
 	mkdir -p linux-stage/fs/ext3 linux-stage/include/linux
 	cp $(ext3_sources) $(ext3_headers) $(ext3_extra) linux-stage/fs/ext3
 	cp $(linux_headers) linux-stage/include/linux
-	cd linux-stage && quilt push -a -q
 if USE_QUILT
 	cd linux-stage && quilt setup -l ../$(series) -d ../$(patches)
 	cd linux-stage && quilt push -a -q
 else
+	@echo -n "Applying ext3 patches:"
 	@cd linux-stage && for i in $$(<../$(series)) ; do \
-               echo "patch -p1 < ../$(patches)/$$i" ; \
-               patch -p1 < ../$(patches)/$$i || exit 1 ; \
+               echo -n " $$i" ; \
+               patch -s -p1 < ../$(patches)/$$i || exit 1 ; \
 	done
+	@echo
 endif
 
 	mkdir linux