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 e2ad951..dd9e66f 100644 (file)
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -7,7 +7,7 @@ snmptag="HEAD"
 ldiskfstag="HEAD"
 ldiskfstag_head="b1_8_iam"
 lustreiokittag="HEAD"
-libcfstag=""
+libcfstag="b1_x"
 dmutag=""
 hg_base_url="http://www.wizy.org/mercurial"
 
@@ -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_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"
         ;;
@@ -188,6 +212,28 @@ case "$lustretag" in
         dmutag="zfs-lustre"
         ;;
 
+    # read-only cache for oss
+    b_hd_rocache_oss)
+        lnettag="HEAD"
+        ldiskfstag="b1_8_iam"
+        libcfstag="HEAD"
+        ;;
+ 
+    # vector read/write 
+    b_hd_readx)
+        lnettag="HEAD"
+        ldiskfstag="$ldiskfstag_head"
+        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"
@@ -205,13 +251,23 @@ case "$lustretag" in
 
     # client io stack cleanup
     b_client_io_layering)
+        lnettag="HEAD"
+        ldiskfstag="$ldiskfstag_head"
+        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
@@ -238,26 +294,52 @@ 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_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"
+        ;;
+
+    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"
         libsysiotag="$lustretag"
         snmptag="$lustretag"
         ldiskfstag="$lustretag"
+        libcfstag="$lustretag"
         ;;
 
     b_HEAD_*|b_head_*|b_hd_*)
         lnettag="b1_x"
         ldiskfstag="$ldiskfstag_head"
         ;;
-
-    # Branches that have been updated to include
-    # the libcfs split should be added here
-    HEAD)
-        lnettag="HEAD"
-        ldiskfstag="$ldiskfstag_head"
-        libcfstag="HEAD"
-        ;;
 esac
 
 cvs_cmd libsysio libsysio "$libsysiotag"
@@ -267,9 +349,7 @@ cvs_cmd snmp lustre-snmp "$snmptag"
 cvs_cmd lustre lustre-core "$lustretag"
 cvs_cmd ldiskfs ldiskfs "$ldiskfstag"
 cvs_cmd lustre-iokit lustre-iokit "$lustreiokittag"
-hg_cmd zfs-lustre "$hg_base_url" "$dmutag"
-if [ -n $libcfstag ]; then
-    cvs_cmd libcfs libcfs "$libcfstag"
-fi
+hg_cmd lustre/zfs-lustre "$hg_base_url" "$dmutag"
+cvs_cmd libcfs libcfs "$libcfstag"
 
 [ -a ldiskfs/build ] || ln -sf ../build ldiskfs/build