Branch HEAD

b=13647
i=scjody
i=adilger

Fixed the 'make rpms' issue.

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index 1084b12..dfb9624 100644 (file)
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -59,6 +59,7 @@ endif # LINUX
 endif # MODULES
 
 dist-hook:
+       rm -f $(distdir)/ldiskfs/*.spec
        find $(distdir) -name .deps -o \
                        -name CVS -o \
                        -name .svn -o \

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 216b287..929fdfa 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -13,6 +13,12 @@ tbd  Sun Microsystems, Inc.
         removed cwd "./" (refer to Bugzilla 14399).
 
 Severity   : normal
+Bugzilla   : 13647
+Description: Lustre make rpms failed.
+Details    : Remove ldiskfs spec file to avoids rpmbuild be confused when
+             builds Lustre rpms from tarball.
+
+Severity   : normal
 Frequency  : rare on shutdown ost
 Bugzilla   : 14608
 Description: If llog cancel was not send before clean_exports phase, this can