X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Fbuildcvs;h=c8d472d8e09d6fe5110f45437d3549c3dbe32009;hb=64ad37195aa1340a4cce8aa21dd5d7c85699ca99;hp=4d51d15ab79412780ca344de487e0cabf8071025;hpb=b363f45e6ec70a4d31cc1f8311a6cd5e476827e3;p=fs%2Flustre-release.git

diff --git a/build/buildcvs b/build/buildcvs
index 4d51d15..c8d472d 100644
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -5,6 +5,8 @@ lnettag="HEAD"
 libsysiotag="HEAD"
 snmptag="HEAD"
 ldiskfstag="HEAD"
+dmutag=""
+hg_base_url="http://www.wizy.org/mercurial"
 
 export LC_COLLATE=C
 
@@ -164,8 +166,15 @@ case "$lustretag" in
         lustretag="HEAD"
         ;;
 
+    b_ula)
+        # lnet "User Level Access" development branch
+	lnettag="b_ula"
+	lustretag="HEAD"
+        ldiskfstag="b1_8_iam"
+	;;
+
     # CMD3
-    HEAD|b_post_cmd3|b1_8_gssfix|b_new_cmd_sles10|b1_6_head_sync|b1_8_dir_ra|b_colibri_devel|b_mixed_layout_req|b_remote_acl|b_mount_perm)
+    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"
         ;;
@@ -174,6 +183,15 @@ case "$lustretag" in
     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
@@ -220,5 +238,6 @@ 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