Whamcloud - gitweb
Branch b_hd_dmu
[fs/lustre-release.git] / build / buildcvs
index 43a2112..913dd59 100644 (file)
@@ -1,9 +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
 
@@ -21,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)
@@ -51,11 +57,6 @@ case "$lustretag" in
         portalstag="b_hd_newconfig"
         ;;
 
-    b_new_cmd)
-       portalstag="b_new_portals"
-        # lnettag="b_lnet_tmp"
-        ;;
-
     b_cmd*)
         portalstag="$lustretag"
         ;;
@@ -70,6 +71,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"
@@ -94,20 +106,14 @@ case "$lustretag" in
         portalstag="b_port_test"
         ;;
 
-    b_ptl_smallfix)
-        portalstag="b_ptl_smallfix"
-        lustretag="b1_4"
-        ;;
-
     b_ptlrpc_cleanup)
         portalstag="b_ptlrpc_cleanup"
         ;;
 
-    b_self_test)
-        # lnet self test development branch
-       lnettag="b_self_test"
-       lustretag="HEAD"
-       ;;
+    b_ptl_smallfix)
+        portalstag="b_ptl_smallfix"
+        lustretag="b1_4"
+        ;;
 
     # before 1_4_6, we didn't have lnet or snmp
     b_release_1_2_*|b_release_1_4_[0-5])
@@ -117,13 +123,6 @@ case "$lustretag" in
         snmptag=""
         ;;
 
-    b_release_1_4_6-patchless)
-        portalstag=b_release_1_4_6
-        lnettag=b_release_1_4_6-patchless
-        libsysiotag=b_release_1_4_6
-        snmptag=b_release_1_4_6
-        ;;
-
     b_release_1_4_6)
         portalstag="$lustretag"
         lnettag="$lustretag"
@@ -131,18 +130,92 @@ case "$lustretag" in
         snmptag="$lustretag"
         ;;
 
+    b_release_1_4_6-patchless)
+        portalstag=b_release_1_4_6
+        lnettag=b_release_1_4_6-patchless
+        libsysiotag=b_release_1_4_6
+        snmptag=b_release_1_4_6
+        ;;
+
     # all later b_release_* tags
     b_release_*)
         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="$ldiskfstag_head"
+       ;;
+
+    # 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_head_interop_disk)
+        # Update b1_8 above when changing this.
+        ldiskfstag="$ldiskfstag_head"
+        ;;
+
+    #umds cleanup
+    b_hd_umds_cln2)
+        ldiskfstag="b1_8_iam_dynlock"
+       ;;
+
     # uOSS
-    b_uoss)
+    b_hd_dmu)
         lnettag="b_uoss"
+        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)
+        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
     v1_[0-3]_*|v1_4_[0-2]|v1_4_[0-2]_*)
         portalstag="$lustretag"
@@ -167,11 +240,25 @@ 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"
         libsysiotag="$lustretag"
         snmptag="$lustretag"
+        ldiskfstag="$lustretag"
+        ;;
+
+    b_HEAD_*|b_head_*|b_hd_*)
+        lnettag="b1_x"
+        ldiskfstag="$ldiskfstag_head"
         ;;
 esac
 
@@ -180,3 +267,9 @@ 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"
+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