b=20298

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

diff --git a/build/buildcvs b/build/buildcvs
index 10e069a..d8c3c45 100644 (file)
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -5,11 +5,14 @@ lnettag="b1_x"
 libsysiotag="HEAD"
 snmptag="HEAD"
 ldiskfstag="HEAD"
-ldiskfstag_head="b1_8_iam"
+ldiskfstag_head="HEAD"
 lustreiokittag="HEAD"
 libcfstag="b1_x"
-dmutag=""
+dmutag="" # uDMU
+spltag=""
+zfstag=""
 hg_base_url="http://www.wizy.org/mercurial"
+git_base_url="git@git.lustre.org:%s.git"
 
 export LC_COLLATE=C
 
@@ -57,6 +60,12 @@ case "$lustretag" in
         portalstag="b_hd_newconfig"
         ;;
 
+    b_cmd_cray)
+        lnettag="HEAD"
+        ldiskfstag="$ldiskfstag_head"
+        libcfstag="HEAD"
+        ;;
+
     b_cmd*)
         portalstag="$lustretag"
         ;;
@@ -73,12 +82,12 @@ case "$lustretag" in
 
     b_mpilnd)
         # lnet mpilnd development branch
-       lnettag="b_mpilnd"
-       lustretag="HEAD"
-       ;;
+        lnettag="b_mpilnd"
+        lustretag="HEAD"
+        ;;
 
     b_new_cmd)
-       portalstag="b_new_portals"
+        portalstag="b_new_portals"
         # lnettag="b_lnet_tmp"
         ;;
 
@@ -147,15 +156,15 @@ case "$lustretag" in
 
     b_self_test)
         # lnet self test development branch
-       lnettag="b_self_test"
-       lustretag="HEAD"
-       ;;
+        lnettag="b_self_test"
+        lustretag="HEAD"
+        ;;
 
     b_usocklnd)
         # lnet usocklnd development branch
-       lnettag="b_usocklnd"
-       lustretag="b1_6_usocklnd"
-       ;;
+        lnettag="b_usocklnd"
+        lustretag="b1_6_usocklnd"
+        ;;
 
     b_uo2iblnd)
         # lnet u-o2iblnd development branch
@@ -165,20 +174,29 @@ case "$lustretag" in
 
     b_hd_lnet_smp)
         # LNet grained locking and SMP improvement branch
+        libcfstag="b_hd_libcfs_smp"
         lnettag="b_hd_lnet_smp"
-        lustretag="HEAD"
-        libcfstag="HEAD"
+        ldiskfstag="$ldiskfstag_head"
+        lustretag="b_hd_lustre_smp"
+        ;;
+
+    b_hd_md_perf)
+        # LNet branch for new o2iblnd protocol (15983, 13621, 14425, 14358)
+        lnettag="HD_LNET_SMP_BASE"
+        ldiskfstag="$ldiskfstag_head"
+        lustretag="HD_LUSTRE_SMP_BASE"
+        libcfstag="HD_LIBCFS_SMP_BASE"
         ;;
 
     b_ula)
         # lnet "User Level Access" development branch
-       lnettag="b_ula"
-       lustretag="HEAD"
+        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_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"
         ;;
@@ -186,7 +204,7 @@ case "$lustretag" in
     #umds cleanup
     b_hd_umds_cln2)
         ldiskfstag="b1_8_iam_dynlock"
-       ;;
+        ;;
 
     # uOSS
     b_hd_dmu)
@@ -198,7 +216,7 @@ case "$lustretag" in
     # read-only cache for oss
     b_hd_rocache_oss)
         lnettag="HEAD"
-        ldiskfstag="b_hd_rocache_oss"
+        ldiskfstag="b1_8_iam"
         libcfstag="HEAD"
         ;;
  
@@ -209,6 +227,21 @@ case "$lustretag" in
         libcfstag="HEAD"
         ;;
    
+    # params_tree 
+    b_hd_params_tree)
+        lnettag="b_hd_params_tree"
+        ldiskfstag="$ldiskfstag_head"
+        libcfstag="b_hd_params_tree"
+        lustretag="b_hd_params_tree"
+        ;;
+  
+    # Network request scheduler
+    b_hd_nrs)
+        lnettag="HEAD"
+        ldiskfstag="$ldiskfstag_head"
+        libcfstag="HEAD"
+        ;;
+ 
     # uMDS
     b_dmu_umds)
         lnettag="b_uoss_umds"
@@ -219,7 +252,7 @@ case "$lustretag" in
     # uOSS o2iblnd
     b_uoss_o2iblnd)
         lnettag="b_uoss_o2iblnd"
-       lustretag="b_hd_dmu"
+        lustretag="b_hd_dmu"
         ldiskfstag="$ldiskfstag_head"
         dmutag="zfs-lustre"
         ;;
@@ -231,10 +264,18 @@ case "$lustretag" in
         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
@@ -268,14 +309,40 @@ case "$lustretag" in
         libcfstag="HEAD"
         ;;
 
+    # libcfs name normalization changes
+    b_hd_nn)
+        libcfstag="b_hd_libcfs_nn"
+        lnettag="b_hd_lnet_nn"
+        ldiskfstag="$ldiskfstag_head"
+        lustretag="b_hd_lustre_nn"
+        ;; 
+
     # Branches that have been updated to include
     # the libcfs split should be added here
-    HEAD|b_head_quota)
+    HEAD|b_head_capa|b_hd_cfld|b_hd_changelog|b_hd_sptlrpc|HD_SPTLRPC_BASE|b_som|b_hd_recov|b_hd_transapi)
         lnettag="HEAD"
         ldiskfstag="$ldiskfstag_head"
         libcfstag="HEAD"
         ;;
 
+    b_hd_kdmu)
+        # Identical to HEAD + spl and zfs
+        lnettag="HEAD"
+        ldiskfstag="$ldiskfstag_head"
+        libcfstag="HEAD"
+        spltag="pre-alpha"
+        zfstag="patched"
+        ;;
+    b_kdmu_params)
+        # Identical to HEAD + spl and zfs
+        lnettag="b_hd_params_tree"
+        ldiskfstag="$ldiskfstag_head"
+        libcfstag="b_hd_params_tree"
+        lustretag="b_kdmu_params"
+        spltag="pre-alpha"
+        zfstag="patched"
+        ;;
+
     b_head_libcfs)
         lnettag="b_head_libcfs"
         ldiskfstag="$ldiskfstag_head"
@@ -288,17 +355,25 @@ case "$lustretag" in
         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"
+        lnettag="HEAD"
         ldiskfstag="$ldiskfstag_head"
+        libcfstag="HEAD"
         ;;
 esac
 
@@ -311,5 +386,7 @@ 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"
+git_cmd spl spl "$spltag" "$git_base_url"
+git_cmd zfs zfs-tmp "$zfstag" "$git_base_url"
 
 [ -a ldiskfs/build ] || ln -sf ../build ldiskfs/build