Branch b1_4

Don't use CFS-specific "-l" flag to quilt during build.  The Makefile
will refresh the whole tree if it is out of date anyways.

diff --git a/ldiskfs/ldiskfs/autoMakefile.am b/ldiskfs/ldiskfs/autoMakefile.am
index 53ca41e..0eff073 100644 (file)
--- a/ldiskfs/ldiskfs/autoMakefile.am
+++ b/ldiskfs/ldiskfs/autoMakefile.am
@@ -38,7 +38,7 @@ sources: $(ext3_sources) $(ext3_headers) $(linux_headers) $(series)
        cp $(ext3_sources) $(ext3_headers) $(ext3_extra) linux-stage/fs/ext3
        cp $(linux_headers) linux-stage/include/linux
 if USE_QUILT
-       cd linux-stage && quilt setup -l ../$(series) -d ../$(patches)
+       cd linux-stage && quilt setup -d ../$(patches) ../$(series)
        cd linux-stage && quilt push -a -q
 else
        @echo -n "Applying ext3 patches:"

diff --git a/lustre/ldiskfs/autoMakefile.am b/lustre/ldiskfs/autoMakefile.am
index 53ca41e..0eff073 100644 (file)
--- a/lustre/ldiskfs/autoMakefile.am
+++ b/lustre/ldiskfs/autoMakefile.am
@@ -38,7 +38,7 @@ sources: $(ext3_sources) $(ext3_headers) $(linux_headers) $(series)
        cp $(ext3_sources) $(ext3_headers) $(ext3_extra) linux-stage/fs/ext3
        cp $(linux_headers) linux-stage/include/linux
 if USE_QUILT
-       cd linux-stage && quilt setup -l ../$(series) -d ../$(patches)
+       cd linux-stage && quilt setup -d ../$(patches) ../$(series)
        cd linux-stage && quilt push -a -q
 else
        @echo -n "Applying ext3 patches:"