Branch HEAD

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

diff --git a/build/buildcvs b/build/buildcvs
index d02e4a8..805471b 100644 (file)
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -8,8 +8,11 @@ ldiskfstag="HEAD"
 ldiskfstag_head="b1_8_iam"
 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"
         ;;
@@ -165,18 +174,10 @@ case "$lustretag" in
 
     b_hd_lnet_smp)
         # LNet grained locking and SMP improvement branch
+        libcfstag="b_hd_libcfs_smp"
         lnettag="b_hd_lnet_smp"
-        ldiskfstag="lnet_smp_ldiskfs"
-        lustretag="lnet_smp_lustre"
-        libcfstag="lnet_smp_libcfs"
-        ;;
-
-    b_hd_lnet_perf)
-        # Tag for lnet performance tests
-        lnettag="HEAD"
-        ldiskfstag="lnet_smp_ldiskfs"
-        lustretag="lnet_smp_lustre"
-        libcfstag="lnet_smp_libcfs"
+        ldiskfstag="$ldiskfstag_head"
+        lustretag="b_hd_lustre_smp"
         ;;
 
     b_hd_o2ib_new_proto)
@@ -228,12 +229,19 @@ case "$lustretag" in
    
     # params_tree 
     b_hd_params_tree)
-        lnettag="HEAD"
+        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"
@@ -303,12 +311,21 @@ case "$lustretag" in
 
     # Branches that have been updated to include
     # the libcfs split should be added here
-    HEAD|b_head_quota|b_hd_cfld|b_hd_changelog|b_hd_sptlrpc|HD_SPTLRPC_BASE|b_som|b_hd_kdmu|b_hd_recov|b_hd_transapi)
+    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="top"
+        ;;
+
     b_head_libcfs)
         lnettag="b_head_libcfs"
         ldiskfstag="$ldiskfstag_head"
@@ -337,8 +354,9 @@ case "$lustretag" in
         ;;
 
     b_HEAD_*|b_head_*|b_hd_*)
-        lnettag="b1_x"
+        lnettag="HEAD"
         ldiskfstag="$ldiskfstag_head"
+        libcfstag="HEAD"
         ;;
 esac
 
@@ -351,5 +369,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 "$zfstag" "$git_base_url"
 
 [ -a ldiskfs/build ] || ln -sf ../build ldiskfs/build