From 5ae4ebb3f1160a53b4706ed014dee1d19481b7cc Mon Sep 17 00:00:00 2001 From: johann Date: Tue, 15 Sep 2009 09:44:31 +0000 Subject: [PATCH] Branch b_release_1_8_1 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. --- autoMakefile.am | 4 ++++ lustre/ChangeLog | 6 ++++++ lustre/scripts/Makefile.am | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/autoMakefile.am b/autoMakefile.am index a6e21e4..970e4de 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -44,4 +44,8 @@ checkstack-clean: module-dist-hook: if [ -d CVS -o -d .git ]; then \ perl lustre/scripts/tree_status.pl > $(distdir)/tree_status; \ + elif [ -f tree_status ]; then \ + cp tree_status $(distdir)/tree_status; \ + else \ + echo -e "I have no idea how to create a tree_status file in $(distdir).\nPlease file a bug at http://bugzilla.lustre.org/"; \ fi diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 32fee25..b232932 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -80,6 +80,12 @@ 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. diff --git a/lustre/scripts/Makefile.am b/lustre/scripts/Makefile.am index 8eebb58..4904457 100644 --- 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 -- 1.8.3.1