Branch b1_8

b=20550
i=adilger (patch from Brian)
i=wangyb
i=yangsheng

This patch fixes the problem of make dist not creating a tree_status when
the tree it's being run in is not from an sccs checkout.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index c03a33f..8502870 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -227,6 +227,11 @@ Details    : down/upgrading the MDS to a version that doesn't/does support OST
             pool can cause clients to crash because the lsm has changed
             behind their back.
 
+Severity   : normal
+Bugzilla   : 20550
+Description: missing tree_status on 1.8.1 RPM build
+Details    : make rpms failed due because the tree_status file is missing.
+
 ------------------------------------------------------------------------------
 2009-07-31 Sun Microsystems, Inc.
        * version 1.8.1
@@ -441,6 +446,7 @@ Bugzilla   : 20139
 Description: panic in ll_statahead_thread
 Details    : grab dentry reference in parent process.
 
+
 -------------------------------------------------------------------------------
 
 tbd Sun Microsystems, Inc.

diff --git a/lustre/scripts/Makefile.am b/lustre/scripts/Makefile.am
index 8eebb58..4904457 100644 (file)
--- a/lustre/scripts/Makefile.am
+++ b/lustre/scripts/Makefile.am
@@ -57,4 +57,4 @@ $(genscripts): %: %.in
        chmod +x $@
 
 tree_status.pl: version_tag.pl
-       ln version_tag.pl tree_status.pl
+       ln -f version_tag.pl tree_status.pl