X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2Fbuildcvs;h=913dd59029c42e7a891487c90977cf6ac499a505;hp=4844c6d3166c17ac01993921223c198a71fbc549;hb=d86f42058c783baf1e9c1855616cb83832bf34e9;hpb=57ab31f23e2060a71f8b40cf7e3a3a82519981bb

diff --git a/build/buildcvs b/build/buildcvs
index 4844c6d..913dd59 100644
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -1,10 +1,15 @@
 # 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"
 
 export LC_COLLATE=C
 
@@ -22,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)
@@ -52,12 +57,6 @@ case "$lustretag" in
         portalstag="b_hd_newconfig"
         ;;
 
-    b1_8)
-        # b1_8 is an alias for HEAD.
-        lustretag="HEAD"
-        ldiskfstag="b1_8_iam"
-        ;;
-
     b_cmd*)
         portalstag="$lustretag"
         ;;
@@ -164,21 +163,57 @@ case "$lustretag" in
         lustretag="HEAD"
         ;;
 
+    b_ula)
+        # lnet "User Level Access" development branch
+	lnettag="b_ula"
+	lustretag="HEAD"
+        ldiskfstag="$ldiskfstag_head"
+	;;
+
     # CMD3
-    HEAD|b_post_cmd3|b1_8_gssfix|b_new_cmd_sles10|b1_6_head_sync|b1_8_dir_ra|b_colibri_devel|b_mixed_layout_req|b_remote_acl)
+    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)
         # Update b1_8 above when changing this.
-        ldiskfstag="b1_8_iam"
+        ldiskfstag="$ldiskfstag_head"
         ;;
 
+    #umds cleanup
+    b_hd_umds_cln2)
+        ldiskfstag="b1_8_iam_dynlock"
+	;;
+
     # uOSS
     b_hd_dmu)
         lnettag="b_uoss"
-        ldiskfstag="b1_8_iam"
+        ldiskfstag="$ldiskfstag_head"
+        dmutag="zfs-lustre"
+        ;;
+
+    # uMDS
+    b_dmu_umds)
+        lnettag="b_uoss_umds"
+        ldiskfstag="$ldiskfstag_head"
+        dmutag="zfs-lustre"
+        ;;
+
+    # uOSS o2iblnd
+    b_uoss_o2iblnd)
+        lnettag="b_uoss_o2iblnd"
+	lustretag="b_hd_dmu"
+        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"
+        ;;
+    
+    # windows client porting (lustre: b_client_io_layering, lnet: HEAD) 
+    b_winnt_port)
+        ldiskfstag="$ldiskfstag_head"
+        lnettag="$lustretag"
         ;;
     
     # v1.0-v1.3, v1.4.0-v1.4.2
@@ -205,6 +240,14 @@ case "$lustretag" in
         snmptag="$lustretag"
         ;;
 
+    # Branches that have been updated to include
+    # the libcfs split should be added here
+    HEAD)
+        lnettag="HEAD"
+        ldiskfstag="$ldiskfstag_head"
+        libcfstag="HEAD"
+        ;;
+
     # all later v* tags
     v[1-9]*)
         lnettag="$lustretag"
@@ -212,6 +255,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"
@@ -220,5 +268,8 @@ cvs_cmd lnet lnet "$lnettag"
 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 lustre/zfs-lustre "$hg_base_url" "$dmutag"
+cvs_cmd libcfs libcfs "$libcfstag"
 
 [ -a ldiskfs/build ] || ln -sf ../build ldiskfs/build