Abstract modules other than lustre-build from the lustrecvs into its

own buildcvs scriptlet.

diff --git a/build/buildcvs b/build/buildcvs
new file mode 100644 (file)
index 0000000..9406f44
--- /dev/null
+++ b/build/buildcvs
@@ -0,0 +1,36 @@
+# This file is sourced by lustre/lustrecvs
+
+portalstag="HEAD"
+libsysiotag="head_0607"
+
+case "$lustretag" in
+    '')
+        warn "a lustretag is required."
+       usage >&2
+       exit 1
+       ;;
+    --help | -h)
+       usage
+       exit 0
+       ;;
+
+    # this is the branch table
+    # keep this list sorted alphabetically!
+
+    b1_4_bgl)
+       portalstag="b1_4_bgl"
+       ;;
+
+    b_newsysio | b_sec)
+        libsysiotag="head_0809"
+       ;;
+
+    b_port_step)
+        portalstag="b_port_step"
+       ;;
+
+esac
+
+cvs_cmd libsysio libsysio "$libsysiotag"
+cvs_cmd portals portals "$portalstag"
+cvs_cmd lustre lustre-core "$lustretag"

diff --git a/lustrecvs b/lustrecvs
index 5c9f0ab..982e9d9 100755 (executable)
--- a/lustrecvs
+++ b/lustrecvs
@@ -23,11 +23,8 @@ Usage: $progname lustretag
 EOF
 }
 
-# portalstag="HEAD"
 buildtag="HEAD"
-portalstag="HEAD"
 lustretag="$1"
-libsysiotag="head_0607"
 
 case "$lustretag" in
     '')
@@ -43,16 +40,8 @@ case "$lustretag" in
     # this is the branch table
     # keep this list sorted alphabetically!
 
-    b1_4_bgl)
-       portalstag="b1_4_bgl"
-       ;;
-
-    b_newsysio | b_sec)
-        libsysiotag="head_0809"
-       ;;
-
-    b_port_step)
-        portalstag="b_port_step"
+    *)
+        buildtag="HEAD"
        ;;
 
 esac
@@ -78,6 +67,9 @@ cvs_cmd ()
 }
 
 cvs_cmd build lustre-build "$buildtag"
-cvs_cmd libsysio libsysio "$libsysiotag"
-cvs_cmd portals portals "$portalstag"
-cvs_cmd lustre lustre-core "$lustretag"
+
+if [ -f build/buildcvs ] ; then
+    . build/buildcvs
+else
+    fatal 1 "build/buildcvs does not exist; not updating other modules."
+fi