Update buildcvs to support b2_9-bld* branches.

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

diff --git a/build/buildcvs b/build/buildcvs
index 40644e0..f883a15 100644 (file)
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -1,11 +1,13 @@
 # This file is sourced by lustre/lustrecvs
 
 portalstag=""
-lnettag="HEAD"
+lnettag="b1_x"
 libsysiotag="HEAD"
 snmptag="HEAD"
 ldiskfstag="HEAD"
+ldiskfstag_head="b1_8_iam"
 lustreiokittag="HEAD"
+libcfstag="b1_x"
 dmutag=""
 hg_base_url="http://www.wizy.org/mercurial"
 
@@ -25,7 +27,7 @@ case "$lustretag" in
     # this is the branch table
     # keep this list sorted alphabetically!
 
-    # Note these are "specials" -- branches using lnet HEAD don't need an
+    # Note these are "specials" -- branches using lnet b1_x don't need an
     # entry here.
 
     b1_2)
@@ -161,17 +163,41 @@ 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"
        lustretag="HEAD"
-        ldiskfstag="b1_8_iam"
+        ldiskfstag="$ldiskfstag_head"
        ;;
 
     # CMD3
-    HEAD|b_post_cmd3|b_HEAD_AT|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_capa|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="b1_8_iam"
+        ldiskfstag="$ldiskfstag_head"
         ;;
 
     #umds cleanup
@@ -182,14 +208,28 @@ case "$lustretag" in
     # uOSS
     b_hd_dmu)
         lnettag="b_uoss"
-        ldiskfstag="b1_8_iam"
+        ldiskfstag="$ldiskfstag_head"
         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"
-        ldiskfstag="b1_8_iam"
+        ldiskfstag="$ldiskfstag_head"
         dmutag="zfs-lustre"
         ;;
 
@@ -197,19 +237,29 @@ case "$lustretag" in
     b_uoss_o2iblnd)
         lnettag="b_uoss_o2iblnd"
        lustretag="b_hd_dmu"
-        ldiskfstag="b1_8_iam"
+        ldiskfstag="$ldiskfstag_head"
         dmutag="zfs-lustre"
         ;;
 
     # client io stack cleanup
     b_client_io_layering)
-        ldiskfstag="b1_8_iam"
+        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="b1_8_iam"
-        lnettag="$lustretag"
+        ldiskfstag="$ldiskfstag_head"
+        lnettag="b_winnt_port"
+        libcfstag="b_winnt_port"
         ;;
     
     # v1.0-v1.3, v1.4.0-v1.4.2
@@ -236,6 +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_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"
@@ -243,6 +326,11 @@ case "$lustretag" in
         snmptag="$lustretag"
         ldiskfstag="$lustretag"
         ;;
+
+    b_HEAD_*|b_head_*|b_hd_*)
+        lnettag="b1_x"
+        ldiskfstag="$ldiskfstag_head"
+        ;;
 esac
 
 cvs_cmd libsysio libsysio "$libsysiotag"
@@ -252,6 +340,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"
+hg_cmd lustre/zfs-lustre "$hg_base_url" "$dmutag"
+cvs_cmd libcfs libcfs "$libcfstag"
 
 [ -a ldiskfs/build ] || ln -sf ../build ldiskfs/build