X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Fbuildcvs;h=5053089534fab77553a861a929a02c12ed1fa892;hb=b1327b1caf680b741c596cf910050eabc1409586;hp=c79c18212b8072ec89d36b4bcb9d8bb306293248;hpb=820b0f1c43d58f4a0e7581c6571db6214b9b3fb6;p=fs%2Flustre-release.git

diff --git a/build/buildcvs b/build/buildcvs
index c79c182..5053089 100644
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -1,9 +1,12 @@
 # This file is sourced by lustre/lustrecvs
 
-portalstag="HEAD"
+portalstag=""
 lnettag="HEAD"
 libsysiotag="HEAD"
 snmptag="HEAD"
+ldiskfstag="HEAD"
+dmutag=""
+hg_base_url="http://www.wizy.org/mercurial"
 
 export LC_COLLATE=C
 
@@ -20,6 +23,10 @@ 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
+    # entry here.
+
     b1_2)
         portalstag="b1_2"
         lnettag=""
@@ -29,42 +36,28 @@ case "$lustretag" in
 
     b1_4_atime_update)
         portalstag="b_hd_newconfig"
-        lnettag="b_hd_newconfig"
         ;;
 
     b1_4_join)
         portalstag="b_hd_newconfig"
-        lnettag="b_hd_newconfig"
         ;;
 
     b1_4_lfs_df)
         portalstag="b_hd_newconfig"
-        lnettag="b_hd_newconfig"
         ;;
 
     b1_4_lov_lvb_cleanup)
         portalstag="b_hd_newconfig"
-        lnettag="b_hd_newconfig"
         ;;
 
     b1_4_next_recovery_transno)
         portalstag="b_hd_newconfig"
-        lnettag="b_hd_newconfig"
-        ;;
-
-    b1_4 | b1_4-patchless | b1_4_*)
-        portalstag="b_hd_newconfig"
-        lnettag="b_hd_newconfig"
-        ;;
-
-    b_new_cmd)
-	portalstag="b_hd_newconfig"
-        lnettag="b_hd_newconfig"
         ;;
 
-    b1_5 | b1_5_*)
-        portalstag="b_hd_newconfig"
-        lnettag="b_hd_newconfig"
+    b1_8)
+        # b1_8 is an alias for HEAD.
+        lustretag="HEAD"
+        ldiskfstag="b1_8_iam"
         ;;
 
     b_cmd*)
@@ -73,7 +66,6 @@ case "$lustretag" in
 
     b_iam*)
         portalstag="b_hd_newconfig"
-        lnettag="b_hd_newconfig"
         # XXX temorary tag until b_iam* is updated from b1_4 liblustre
         libsysiotag="HEAD_RELEASE_1_4_6_LAND_PARENT_20060223_1455"
         ;;
@@ -82,6 +74,17 @@ case "$lustretag" in
         portalstag="b_ioprovement"
         ;;
 
+    b_mpilnd)
+        # lnet mpilnd development branch
+	lnettag="b_mpilnd"
+	lustretag="HEAD"
+	;;
+
+    b_new_cmd)
+	portalstag="b_new_portals"
+        # lnettag="b_lnet_tmp"
+        ;;
+
     b_newconfig_rdmarouting)
         portalstag="b_hd_newconfig"
         lnettag="b_newconfig_rdmarouting"
@@ -106,15 +109,15 @@ case "$lustretag" in
         portalstag="b_port_test"
         ;;
 
+    b_ptlrpc_cleanup)
+        portalstag="b_ptlrpc_cleanup"
+        ;;
+
     b_ptl_smallfix)
         portalstag="b_ptl_smallfix"
         lustretag="b1_4"
         ;;
 
-    b_ptlrpc_cleanup)
-        portalstag="b_ptlrpc_cleanup"
-        ;;
-
     # before 1_4_6, we didn't have lnet or snmp
     b_release_1_2_*|b_release_1_4_[0-5])
         portalstag="$lustretag"
@@ -123,6 +126,13 @@ case "$lustretag" in
         snmptag=""
         ;;
 
+    b_release_1_4_6)
+        portalstag="$lustretag"
+        lnettag="$lustretag"
+        libsysiotag="$lustretag"
+        snmptag="$lustretag"
+        ;;
+
     b_release_1_4_6-patchless)
         portalstag=b_release_1_4_6
         lnettag=b_release_1_4_6-patchless
@@ -132,12 +142,74 @@ case "$lustretag" in
 
     # all later b_release_* tags
     b_release_*)
-        portalstag="$lustretag"
         lnettag="$lustretag"
         libsysiotag="$lustretag"
         snmptag="$lustretag"
+        ldiskfstag="$lustretag"
+        ;;
+
+    b_self_test)
+        # lnet self test development branch
+	lnettag="b_self_test"
+	lustretag="HEAD"
+	;;
+
+    b_usocklnd)
+        # lnet usocklnd development branch
+	lnettag="b_usocklnd"
+	lustretag="b1_6_usocklnd"
+	;;
+
+    b_uo2iblnd)
+        # lnet u-o2iblnd development branch
+        lnettag="b_uo2iblnd"
+        lustretag="HEAD"
+        ;;
+
+    b_ula)
+        # lnet "User Level Access" development branch
+	lnettag="b_ula"
+	lustretag="HEAD"
+        ldiskfstag="b1_8_iam"
+	;;
+
+    # CMD3
+    HEAD|b_post_cmd3|b_HEAD_AT|b_new_cmd_sles10|b1_6_head_sync|b1_8_dir_ra|b_mixed_layout_req|b_mount_perm|b1_8_gns|b1_8_quota|b1_8_interop_server|b_som)
+        # Update b1_8 above when changing this.
+        ldiskfstag="b1_8_iam"
+        ;;
+
+    #umds cleanup
+    b_hd_umds_cln2)
+        ldiskfstag="b1_8_iam_dynlock"
+	;;
+
+    # uOSS
+    b_hd_dmu)
+        lnettag="b_uoss"
+        ldiskfstag="b1_8_iam"
+        dmutag="zfs-lustre"
         ;;
 
+    # uOSS o2iblnd
+    b_uoss_o2iblnd)
+        lnettag="b_uoss_o2iblnd"
+	lustretag="b_hd_dmu"
+        ldiskfstag="b1_8_iam"
+        dmutag="zfs-lustre"
+        ;;
+
+    # client io stack cleanup
+    b_client_io_layering)
+        ldiskfstag="b1_8_iam"
+        ;;
+    
+    # windows client porting (lustre: b_client_io_layering, lnet: HEAD) 
+    b_winnt_port)
+        ldiskfstag="b1_8_iam"
+        lnettag="$lustretag"
+        ;;
+    
     # v1.0-v1.3, v1.4.0-v1.4.2
     v1_[0-3]_*|v1_4_[0-2]|v1_4_[0-2]_*)
         portalstag="$lustretag"
@@ -154,12 +226,20 @@ case "$lustretag" in
         snmptag="$lustretag"
         ;;
 
+    # v1.4.6, v1.4.6.[1-91]
+    v1_4_6_[1-9]|v1_4_6_9[01])
+        portalstag="$lustretag"
+        lnettag=""
+        libsysiotag="$lustretag"
+        snmptag="$lustretag"
+        ;;
+
     # all later v* tags
     v[1-9]*)
-        portalstag="$lustretag"
         lnettag="$lustretag"
         libsysiotag="$lustretag"
         snmptag="$lustretag"
+        ldiskfstag="$lustretag"
         ;;
 esac
 
@@ -168,3 +248,7 @@ cvs_cmd portals portals "$portalstag"
 cvs_cmd lnet lnet "$lnettag"
 cvs_cmd snmp lustre-snmp "$snmptag"
 cvs_cmd lustre lustre-core "$lustretag"
+cvs_cmd ldiskfs ldiskfs "$ldiskfstag"
+hg_cmd zfs-lustre "$hg_base_url" "$dmutag"
+
+[ -a ldiskfs/build ] || ln -sf ../build ldiskfs/build