Update buildcvs to use the correct tags for b_hd_kdmu.

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

diff --git a/build/buildcvs b/build/buildcvs
index 10e069a..dd9e66f 100644 (file)
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -166,6 +166,23 @@ case "$lustretag" in
     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"
         ;;
@@ -178,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_interop_server|b_som)
+    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)
         # Update b1_8 above when changing this.
         ldiskfstag="$ldiskfstag_head"
         ;;
@@ -198,7 +215,7 @@ case "$lustretag" in
     # read-only cache for oss
     b_hd_rocache_oss)
         lnettag="HEAD"
-        ldiskfstag="b_hd_rocache_oss"
+        ldiskfstag="b1_8_iam"
         libcfstag="HEAD"
         ;;
  
@@ -209,6 +226,14 @@ case "$lustretag" in
         libcfstag="HEAD"
         ;;
    
+    # params_tree 
+    b_hd_params_tree)
+        lnettag="HEAD"
+        ldiskfstag="$ldiskfstag_head"
+        libcfstag="b_hd_params_tree"
+        lustretag="b_hd_params_tree"
+        ;;
+   
     # uMDS
     b_dmu_umds)
         lnettag="b_uoss_umds"
@@ -231,10 +256,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
@@ -270,7 +303,7 @@ case "$lustretag" in
 
     # Branches that have been updated to include
     # the libcfs split should be added here
-    HEAD|b_head_quota)
+    HEAD|b_head_quota|b_hd_cfld|b_hd_changelog|b_hd_sptlrpc|HD_SPTLRPC_BASE|b_som|b_hd_kdmu)
         lnettag="HEAD"
         ldiskfstag="$ldiskfstag_head"
         libcfstag="HEAD"
@@ -288,12 +321,19 @@ case "$lustretag" in
         libcfstag="b_head_procfs"
        ;;
 
+    b2_0-bld*)
+        lnettag="$lustretag"
+        ldiskfstag="$ldiskfstag_head"
+        libcfstag="$lustretag"
+       ;;
+
     # all later v* tags
     v[1-9]*)
         lnettag="$lustretag"
         libsysiotag="$lustretag"
         snmptag="$lustretag"
         ldiskfstag="$lustretag"
+        libcfstag="$lustretag"
         ;;
 
     b_HEAD_*|b_head_*|b_hd_*)