From 17670c57ae3515c7c7937354c8d574637b2031b0 Mon Sep 17 00:00:00 2001
From: ccooper <ccooper>
Date: Wed, 28 Apr 2004 18:09:27 +0000
Subject: [PATCH] - re-add cvs datestamp functionality (enabled by default),
but allow it to be overridden by using the --disable-datestamp flag
---
lustre/scripts/lbuild | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/lustre/scripts/lbuild b/lustre/scripts/lbuild
index 0043b401f4..8f599693da 100755
--- a/lustre/scripts/lbuild
+++ b/lustre/scripts/lbuild
@@ -29,6 +29,7 @@ UP_ARCHS=
DATE=$(date)
+USE_DATESTAMP=1
RPMBUILD=
cleanup()
@@ -113,6 +114,11 @@ Usage: ${0##*/} [OPTION]... [-- <lustre configure options>]
Also note that by using a non-"base" arch (eg, i386) only kernels
will be built - there will be no lustre-lite-utils package.
+ --disable-datestamp
+ Prevents the datestamp flag (-D) from being passed to cvs for
+ checkouts. This is a workaround for a problem encountered when
+ using lbuild with tinderbox.
+
EOF
# list_targets
@@ -244,7 +250,13 @@ unpack_lustre()
untar "$LUSTRE"
[ -d lustre ] || ln -sf lustre* lustre
else
- cvs -d "$CVSROOT" -qz3 co -r "$TAG" -d "$DIRNAME" lustre || \
+ if [ "$USE_DATESTAMP" ]; then
+ DATESTAMP="-D '$DATE'"
+ else
+ DATESTAMP=""
+ fi
+
+ cvs -d "$CVSROOT" -qz3 co $DATESTAMP -r "$TAG" -d "$DIRNAME" lustre || \
fatal 1 "There was an error checking out Lustre from CVS."
echo "Creating lustre tarball..."
tar zcf "$DIRNAME.tar.gz" "$DIRNAME" \
@@ -364,7 +376,7 @@ publish()
[ -r ~/.lbuildrc ] && . ~/.lbuildrc
-options=$(getopt -o d:D:h -l extraversion:,kerneldir:,lustre:,nosrc,publish,release,tag:,target:,target-archs: -- "$@")
+options=$(getopt -o d:D:h -l extraversion:,kerneldir:,lustre:,nosrc,publish,release,tag:,target:,target-archs:,disable-datestamp -- "$@")
eval set -- "$options"
@@ -420,6 +432,10 @@ while [ "$1" ] ; do
TARGET_ARCHS=$2
shift 2
;;
+ --disable-datestamp)
+ USE_DATESTAMP=
+ shift
+ ;;
--)
shift
CONFIGURE_FLAGS=$@
--
GitLab