Branch b1_4

Per Eric's request - remove portals from the build tree, as he is testing
with Cray portals directly, when testing the ptllnd.
r=eeb

diff --git a/build/autogen.sh b/build/autogen.sh
index ca6572d..e32e26a 100644 (file)
--- a/build/autogen.sh
+++ b/build/autogen.sh
@@ -79,7 +79,7 @@ check_version() {
 
 echo "Checking for a complete tree..."
 # required directories
-for dir in build lnet portals lustre ; do
+for dir in build lnet lustre ; do
     if [ ! -d "$dir" ] ; then
        cat >&2 <<EOF
 Your tree seems to be missing $dir.

diff --git a/build/branch.sh b/build/branch.sh
index aa6ecce..591213f 100755 (executable)
--- a/build/branch.sh
+++ b/build/branch.sh
@@ -19,7 +19,7 @@ fi
 module=$(basename $(<$dir/CVS/Repository))
 
 if [ "$module" = "lustre" ]; then
-    echo >&2 "${progname}: You probably want to branch lustre or portals."
+    echo >&2 "${progname}: You probably want to branch lustre or lnet."
     echo >&2 "${progname}: Try using ${0} $parent $child lustre"
     exit 1
 fi

diff --git a/build/buildcvs b/build/buildcvs
index c79c182..310eeca 100644 (file)
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -1,6 +1,6 @@
 # This file is sourced by lustre/lustrecvs
 
-portalstag="HEAD"
+portalstag=""
 lnettag="HEAD"
 libsysiotag="HEAD"
 snmptag="HEAD"
@@ -130,9 +130,15 @@ case "$lustretag" in
         snmptag=b_release_1_4_6
         ;;
 
+    b_release_1_4_6)
+        portalstag="$lustretag"
+        lnettag="$lustretag"
+        libsysiotag="$lustretag"
+        snmptag="$lustretag"
+        ;;
+
     # all later b_release_* tags
     b_release_*)
-        portalstag="$lustretag"
         lnettag="$lustretag"
         libsysiotag="$lustretag"
         snmptag="$lustretag"
@@ -154,9 +160,16 @@ case "$lustretag" in
         snmptag="$lustretag"
         ;;
 
+    # v1.4.6, v1.4.6.[1-91]
+    v1_4_6_[1-9]|v1_4_6_9[01])
+        portalstag="$lustretag"
+        lnettag=""
+        libsysiotag="$lustretag"
+        snmptag="$lustretag"
+        ;;
+
     # all later v* tags
     v[1-9]*)
-        portalstag="$lustretag"
         lnettag="$lustretag"
         libsysiotag="$lustretag"
         snmptag="$lustretag"