X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Fbuildcvs;h=7ee48cc3f2b7e2fa0488c8b3d66d9893a5360bd7;hb=ee5527465bad6ed3aacb812c2a7466d623d4f49b;hp=05ab5033518418f801527614785cb7aea8add2cc;hpb=ff883f886c46916ad003f8e56e16605ad84668a9;p=fs%2Flustre-release.git

diff --git a/build/buildcvs b/build/buildcvs
index 05ab503..7ee48cc 100644
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -9,77 +9,100 @@ export LC_COLLATE=C
 
 case "$lustretag" in
     '')
-	warn "a lustretag is required."
-	usage >&2
-	exit 1
-	;;
+        warn "a lustretag is required."
+        usage >&2
+        exit 1
+        ;;
     --help | -h)
-	usage
-	exit 0
-	;;
+        usage
+        exit 0
+        ;;
 
     # this is the branch table
     # keep this list sorted alphabetically!
     b1_2)
-	portalstag="b1_2"
-	;;
+        portalstag="b1_2"
+        ;;
 
-    b1_4)
-	snmptag="HEAD"
-	;;
+    b1_4_rhel4_22)
+        snmptag="HEAD"
+        portalstag="b_release_1_4_6"
+        lnettag="b_release_1_4_6"
+        ;;
 
-    b1_4_newconfig)	
+    b1_4 | b1_4_*)
+        snmptag="HEAD"
         portalstag="b_hd_newconfig"
         lnettag="b_hd_newconfig"
-	;;
+        ;;
+    b1_4_join)
+        snmptag="HEAD"
+        portalstag="b_hd_newconfig"
+        lnettag="b_hd_newconfig"
+        ;;
 
     b_cmd*)
-    	portalstag="$lustretag"
-	;;
+        portalstag="$lustretag"
+        ;;
+
+    b_ioprovement)
+        portalstag=b_ioprovement
+        ;;
+
+    b_newconfig_rdmarouting)
+        portalstag="b_hd_newconfig"
+        lnettag="b_newconfig_rdmarouting"
+        lustretag="b1_4"
+        ;;
 
     b_port_ahead)
-	portalstag="b_port_ahead"
-	;;
+        portalstag="b_port_ahead"
+        ;;
 
     b_port_netid)
-	portalstag="b_port_netid"
-	;;
+        portalstag="b_port_netid"
+        ;;
 
     # b_port_step is only for portals
     b_port_step)
-	portalstag="b_port_step"
-	lustretag="HEAD"
-	;;
+        portalstag="b_port_step"
+        lustretag="HEAD"
+        ;;
 
     b_port_test)
-	portalstag="b_port_test"
-	;;
+        portalstag="b_port_test"
+        ;;
 
     b_ptl_smallfix)
-	portalstag="b_ptl_smallfix"
-	lustretag="b1_4"
-	;;
+        portalstag="b_ptl_smallfix"
+        lustretag="b1_4"
+        ;;
 
     b_ptlrpc_cleanup)
-	portalstag="b_ptlrpc_cleanup"
-	;;
+        portalstag="b_ptlrpc_cleanup"
+        ;;
 
     b_release_*)
-	portalstag=$lustretag
-	;;
-
-    b_ioprovement)
-	portalstag=b_ioprovement
-	;;
-
-    v1_[0-3]*|v1_4_*|[A-Z]*)
-	portalstag="$lustretag"
-	;;
-
-    v[1-9]*|cray_200[5-9]*)
-	portalstag="$lustretag"
-	libsysiotag="$lustretag"
-	;;
+        portalstag=$lustretag
+        ;;
+
+    # v1.0-v1.3, v1.4.0-v1.4.2
+    v1_[0-3]_*|v1_4_[0-2]*)
+        portalstag="$lustretag"
+        ;;
+
+    # v1.4.3-v1.4.5, v1.4.5.1 - v1.4.5.9
+    v1_4_[3-5]|v1_4_[3-4]_*|v1_4_5_[1-9]|cray_2005*)
+        portalstag="$lustretag"
+        libsysiotag="$lustretag"
+        ;;
+
+    # all later v* tags
+    v[1-9]*)
+        portalstag="$lustretag"
+        lnettag="$lustretag"
+        libsysiotag="$lustretag"
+        ;;
 esac
 
 cvs_cmd libsysio libsysio "$libsysiotag"