X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2Fbuildcvs;h=b74516f89834fadc19b96d2f619fa9bda9b16f09;hp=67b473215e5378d39796fe4613664aed4245e2ca;hb=e13d5e353e4b7d89e97b4981357eb082a00dbd3a;hpb=945badb1444ff5f2cf6d171607f417281022b4fd

diff --git a/build/buildcvs b/build/buildcvs
index 67b4732..b74516f 100644
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -52,9 +52,10 @@ case "$lustretag" in
         portalstag="b_hd_newconfig"
         ;;
 
-    b_new_cmd)
-	portalstag="b_new_portals"
-        # lnettag="b_lnet_tmp"
+    b1_8)
+        # b1_8 is an alias for HEAD.
+        lustretag="HEAD"
+        ldiskfstag="b1_8_iam"
         ;;
 
     b_cmd*)
@@ -71,6 +72,17 @@ case "$lustretag" in
         portalstag="b_ioprovement"
         ;;
 
+    b_mpilnd)
+        # lnet mpilnd development branch
+	lnettag="b_mpilnd"
+	lustretag="HEAD"
+	;;
+
+    b_new_cmd)
+	portalstag="b_new_portals"
+        # lnettag="b_lnet_tmp"
+        ;;
+
     b_newconfig_rdmarouting)
         portalstag="b_hd_newconfig"
         lnettag="b_newconfig_rdmarouting"
@@ -95,26 +107,14 @@ case "$lustretag" in
         portalstag="b_port_test"
         ;;
 
-    b_ptl_smallfix)
-        portalstag="b_ptl_smallfix"
-        lustretag="b1_4"
-        ;;
-
     b_ptlrpc_cleanup)
         portalstag="b_ptlrpc_cleanup"
         ;;
 
-    b_self_test)
-        # lnet self test development branch
-	lnettag="b_self_test"
-	lustretag="HEAD"
-	;;
-
-    b_mpilnd)
-        # lnet mpilnd development branch
-	lnettag="b_mpilnd"
-	lustretag="HEAD"
-	;;
+    b_ptl_smallfix)
+        portalstag="b_ptl_smallfix"
+        lustretag="b1_4"
+        ;;
 
     # before 1_4_6, we didn't have lnet or snmp
     b_release_1_2_*|b_release_1_4_[0-5])
@@ -124,13 +124,6 @@ case "$lustretag" in
         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"
@@ -138,23 +131,56 @@ case "$lustretag" in
         snmptag="$lustretag"
         ;;
 
+    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
+        ;;
+
     # all later b_release_* tags
     b_release_*)
         lnettag="$lustretag"
         libsysiotag="$lustretag"
         snmptag="$lustretag"
+        ldiskfstag="$lustretag"
         ;;
 
-    # uOSS
-    b_uoss)
-        lnettag="b_uoss"
+    b_self_test)
+        # lnet self test development branch
+	lnettag="b_self_test"
+	lustretag="HEAD"
+	;;
+
+    b_usocklnd)
+        # lnet usocklnd development branch
+	lnettag="b_usocklnd"
+	lustretag="b1_6_usocklnd"
+	;;
+
+    b_uo2iblnd)
+        # lnet u-o2iblnd development branch
+        lnettag="b_uo2iblnd"
+        lustretag="HEAD"
         ;;
-    
+
     # CMD3
-    b_post_cmd3|b1_8_gssfix)
+    HEAD|b_post_cmd3|b_HEAD_AT|b_new_cmd_sles10|b1_6_head_sync|b1_8_dir_ra|b_colibri_devel|b_mixed_layout_req|b_remote_acl|b_mount_perm)
+        # Update b1_8 above when changing this.
         ldiskfstag="b1_8_iam"
         ;;
 
+    # uOSS
+    b_hd_dmu)
+        lnettag="b_uoss"
+        ldiskfstag="b1_8_iam"
+        ;;
+
+    # client io stack cleanup
+    b_client_io_layering)
+        ldiskfstag="b1_8_iam"
+        ;;
+    
     # v1.0-v1.3, v1.4.0-v1.4.2
     v1_[0-3]_*|v1_4_[0-2]|v1_4_[0-2]_*)
         portalstag="$lustretag"
@@ -184,6 +210,7 @@ case "$lustretag" in
         lnettag="$lustretag"
         libsysiotag="$lustretag"
         snmptag="$lustretag"
+        ldiskfstag="$lustretag"
         ;;
 esac