X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2Fbuildcvs;h=9dee3a6c5cd5c90a92b81b942fd5f7498b885781;hp=57ff664ad985629451b998ec6c53d07be4541b53;hb=408482a76c996b8af869443069994dac5b76c892;hpb=52dcd708f7479874e0a5be9237f491e5ff82cc13

diff --git a/build/buildcvs b/build/buildcvs
index 57ff664..9dee3a6 100644
--- 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"
         ;;
@@ -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,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="$ldiskfstag_head"
-        lustretag="HEAD"
-        libcfstag="HEAD"
-        ;;
-
-    b_hd_lnet_smp_concur)
-        # LNet grained locking and SMP concurrency branch
-        lnettag="b_hd_lnet_smp_concur"
-        ldiskfstag="$ldiskfstag_head"
-        lustretag="HEAD"
-        libcfstag="HEAD"
+        lustretag="b_hd_lustre_smp"
         ;;
 
     b_hd_o2ib_new_proto)
@@ -189,13 +190,13 @@ case "$lustretag" in
 
     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"
         ;;
@@ -203,7 +204,7 @@ case "$lustretag" in
     #umds cleanup
     b_hd_umds_cln2)
         ldiskfstag="b1_8_iam_dynlock"
-	;;
+        ;;
 
     # uOSS
     b_hd_dmu)
@@ -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"
@@ -244,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"
         ;;
@@ -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)
+    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_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-tmp "$zfstag" "$git_base_url"
 
 [ -a ldiskfs/build ] || ln -sf ../build ldiskfs/build