Branch b1_6

b=13647
i=scjody
i=adilger

Fixed the 'make rpms' issue.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index cd498a7..aa706b0 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -17,6 +17,12 @@ tbd  Sun Microsystems, Inc.
        * RHEL 4 and RHEL 5/SLES 10 clients behaves differently on 'cd' to a
         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   : enhancement
 Bugzilla   : 14498
 Description: Update to SLES9 SP4 kernel-2.6.5-7.308.