Whamcloud - gitweb
fix non-quilt build
authorjacob <jacob>
Wed, 27 Apr 2005 00:57:09 +0000 (00:57 +0000)
committerjacob <jacob>
Wed, 27 Apr 2005 00:57:09 +0000 (00:57 +0000)
ldiskfs/ldiskfs/autoMakefile.am
lustre/ldiskfs/autoMakefile.am

index 4fd32d4..7c68d87 100644 (file)
@@ -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
        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
 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 \
        @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
        done
+       @echo
 endif
 
        mkdir linux
 endif
 
        mkdir linux
index 4fd32d4..7c68d87 100644 (file)
@@ -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
        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
 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 \
        @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
        done
+       @echo
 endif
 
        mkdir linux
 endif
 
        mkdir linux