X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Fbuildcvs;h=ae04cc975b179374c05c344a7cbbd0b4766abefe;hb=f3f76b59e7f35404f41f8ad1dbdeabe647999ea3;hp=741a97d6b56dbb0f5dfd4a393be9a8677a2beeb4;hpb=94651e417304eac34b09dbc6001c4ae762c53244;p=fs%2Flustre-release.git

diff --git a/build/buildcvs b/build/buildcvs
index 741a97d..ae04cc9 100644
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -1,9 +1,9 @@
 # This file is sourced by lustre/lustrecvs
 
-portalstag="HEAD"
+portalstag=""
 lnettag="HEAD"
 libsysiotag="HEAD"
-snmptag=""
+snmptag="HEAD"
 
 export LC_COLLATE=C
 
@@ -22,47 +22,50 @@ case "$lustretag" in
     # keep this list sorted alphabetically!
     b1_2)
         portalstag="b1_2"
+        lnettag=""
+        libsysiotag=""
+        snmptag=""
         ;;
 
     b1_4_atime_update)
-        snmptag="HEAD"
         portalstag="b_hd_newconfig"
         lnettag="b_hd_newconfig"
-	;;
+        ;;
 
     b1_4_join)
-        snmptag="HEAD"
         portalstag="b_hd_newconfig"
         lnettag="b_hd_newconfig"
         ;;
 
     b1_4_lfs_df)
-        snmptag="HEAD"
         portalstag="b_hd_newconfig"
         lnettag="b_hd_newconfig"
-	;;
+        ;;
 
     b1_4_lov_lvb_cleanup)
-        snmptag="HEAD"
         portalstag="b_hd_newconfig"
         lnettag="b_hd_newconfig"
-	;;
+        ;;
 
     b1_4_next_recovery_transno)
-        snmptag="HEAD"
         portalstag="b_hd_newconfig"
         lnettag="b_hd_newconfig"
-	;;
-	
-    b1_4 | b1_4_*)
-        snmptag="HEAD"
-        portalstag="b_hd_newconfig"
+        ;;
+
+    b1_4 | b1_4-patchless | b1_4_*)
+        lnettag="b_hd_newconfig"
+        ;;
+
+    b_new_cmd)
+	portalstag="b_new_portals"
         lnettag="b_hd_newconfig"
         ;;
 
     b1_5 | b1_5_*)
-        snmptag="HEAD"
-        portalstag="b_hd_newconfig"
+        lnettag="b_hd_newconfig"
+        ;;
+
+    b1_8 | b1_8_*)
         lnettag="b_hd_newconfig"
         ;;
 
@@ -71,9 +74,10 @@ case "$lustretag" in
         ;;
 
     b_iam*)
-        snmptag="HEAD"
         portalstag="b_hd_newconfig"
         lnettag="b_hd_newconfig"
+        # XXX temorary tag until b_iam* is updated from b1_4 liblustre
+        libsysiotag="HEAD_RELEASE_1_4_6_LAND_PARENT_20060223_1455"
         ;;
 
     b_ioprovement)
@@ -113,35 +117,64 @@ case "$lustretag" in
         portalstag="b_ptlrpc_cleanup"
         ;;
 
-    # starting with 1_4_6, we have a tagged lnet too
-    b_release_1_4_[6-9]*)
+    # before 1_4_6, we didn't have lnet or snmp
+    b_release_1_2_*|b_release_1_4_[0-5])
         portalstag="$lustretag"
+        lnettag=""
         libsysiotag="$lustretag"
+        snmptag=""
+        ;;
+
+    b_release_1_4_6-patchless)
+        portalstag=b_release_1_4_6
+        lnettag=b_release_1_4_6-patchless
+        libsysiotag=b_release_1_4_6
+        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"
         ;;
 
     # v1.0-v1.3, v1.4.0-v1.4.2
-    v1_[0-3]_*|v1_4_[0-2]*)
+    v1_[0-3]_*|v1_4_[0-2]|v1_4_[0-2]_*)
         portalstag="$lustretag"
+        lnettag=""
         libsysiotag="$lustretag"
+        snmptag=""
         ;;
 
     # 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"
+        lnettag=""
+        libsysiotag="$lustretag"
+        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"
         ;;
 esac