Update buildcvs to support b2_9-bld* branches.

[fs/lustre-release.git] / build / buildcvs

diff --git a/build/buildcvs b/build/buildcvs
index e52eb88..f883a15 100644 (file)
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -163,6 +163,30 @@ case "$lustretag" in
         lustretag="HEAD"
         ;;
 
+    b_hd_lnet_smp)
+        # LNet grained locking and SMP improvement branch
+        lnettag="b_hd_lnet_smp"
+        ldiskfstag="$ldiskfstag_head"
+        lustretag="HEAD"
+        libcfstag="HEAD"
+        ;;
+
+    b_hd_lnet_smp_concur)
+        # LNet grained locking and SMP concurrency branch
+        lnettag="b_hd_lnet_smp_concur"
+        ldiskfstag="$ldiskfstag_head"
+        lustretag="HEAD"
+        libcfstag="HEAD"
+        ;;
+
+    b_hd_o2ib_new_proto)
+        # LNet branch for new o2iblnd protocol (15983, 13621, 14425, 14358)
+        lnettag="b_hd_o2ib_new_proto"
+        ldiskfstag="$ldiskfstag_head"
+        lustretag="HEAD"
+        libcfstag="HEAD"
+        ;;
+
     b_ula)
         # lnet "User Level Access" development branch
        lnettag="b_ula"
@@ -171,7 +195,7 @@ case "$lustretag" in
        ;;
 
     # CMD3
-    b_post_cmd3|b_new_cmd_sles10|b1_6_head_sync|b_mixed_layout_req|b_mount_perm|b1_8_gns|b1_8_quota|b1_8_interop_server|b_som|b_head_interop_disk)
+    b_post_cmd3|b_new_cmd_sles10|b1_6_head_sync|b_mixed_layout_req|b_mount_perm|b1_8_gns|b1_8_interop_server|b_som)
         # Update b1_8 above when changing this.
         ldiskfstag="$ldiskfstag_head"
         ;;
@@ -188,6 +212,20 @@ case "$lustretag" in
         dmutag="zfs-lustre"
         ;;
 
+    # read-only cache for oss
+    b_hd_rocache_oss)
+        lnettag="HEAD"
+        ldiskfstag="b_hd_rocache_oss"
+        libcfstag="HEAD"
+        ;;
+ 
+    # vector read/write 
+    b_hd_readx)
+        lnettag="HEAD"
+        ldiskfstag="$ldiskfstag_head"
+        libcfstag="HEAD"
+        ;;
+   
     # uMDS
     b_dmu_umds)
         lnettag="b_uoss_umds"
@@ -210,10 +248,18 @@ case "$lustretag" in
         libcfstag="HEAD"
         ;;
     
+    # HEAD cmd fixes
+    b_head_cmd)
+        lnettag="HEAD"
+        ldiskfstag="$ldiskfstag_head"
+        libcfstag="HEAD"
+        ;;
+    
     # windows client porting (lustre: b_client_io_layering, lnet: HEAD) 
     b_winnt_port)
         ldiskfstag="$ldiskfstag_head"
-        lnettag="$lustretag"
+        lnettag="b_winnt_port"
+        libcfstag="b_winnt_port"
         ;;
     
     # v1.0-v1.3, v1.4.0-v1.4.2
@@ -240,14 +286,39 @@ case "$lustretag" in
         snmptag="$lustretag"
         ;;
 
+    # Interoperability server side changes
+    b_head_interop_disk)
+        lnettag="HEAD"
+        ldiskfstag="b_ldiskfs_interop_server"
+        libcfstag="HEAD"
+        ;;
+
     # Branches that have been updated to include
     # the libcfs split should be added here
-    HEAD|b_HEAD_AT)
+    HEAD|b_head_quota|b_hd_comp_fld)
         lnettag="HEAD"
         ldiskfstag="$ldiskfstag_head"
         libcfstag="HEAD"
         ;;
 
+    b_head_libcfs)
+        lnettag="b_head_libcfs"
+        ldiskfstag="$ldiskfstag_head"
+        libcfstag="b_head_libcfs"
+        ;;
+
+    b_head_procfs)
+        lnettag="HEAD"
+        ldiskfstag="$ldiskfstag_head"
+        libcfstag="b_head_procfs"
+       ;;
+
+    b2_0-bld*)
+        lnettag="$lustretag"
+        ldiskfstag="$ldiskfstag_head"
+        libcfstag="$lustretag"
+       ;;
+
     # all later v* tags
     v[1-9]*)
         lnettag="$lustretag"