Branch b_hd_dmu

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

diff --git a/build/buildcvs b/build/buildcvs
index a745c06..913dd59 100644 (file)
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -1,10 +1,13 @@
 # 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"
 
@@ -24,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)
@@ -164,13 +167,13 @@ case "$lustretag" in
         # lnet "User Level Access" development branch
        lnettag="b_ula"
        lustretag="HEAD"
-        ldiskfstag="b1_8_iam"
+        ldiskfstag="$ldiskfstag_head"
        ;;
 
     # CMD3
-    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|b_head_capa|b_head_interop_disk)
+    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="b1_8_iam"
+        ldiskfstag="$ldiskfstag_head"
         ;;
 
     #umds cleanup
@@ -181,14 +184,14 @@ case "$lustretag" in
     # uOSS
     b_hd_dmu)
         lnettag="b_uoss"
-        ldiskfstag="b1_8_iam"
+        ldiskfstag="$ldiskfstag_head"
         dmutag="zfs-lustre"
         ;;
 
     # uMDS
     b_dmu_umds)
         lnettag="b_uoss_umds"
-        ldiskfstag="b1_8_iam"
+        ldiskfstag="$ldiskfstag_head"
         dmutag="zfs-lustre"
         ;;
 
@@ -196,18 +199,20 @@ case "$lustretag" in
     b_uoss_o2iblnd)
         lnettag="b_uoss_o2iblnd"
        lustretag="b_hd_dmu"
-        ldiskfstag="b1_8_iam"
+        ldiskfstag="$ldiskfstag_head"
         dmutag="zfs-lustre"
         ;;
 
     # client io stack cleanup
     b_client_io_layering)
-        ldiskfstag="b1_8_iam"
+        lnettag="HEAD"
+        ldiskfstag="$ldiskfstag_head"
+        libcfstag="HEAD"
         ;;
     
     # windows client porting (lustre: b_client_io_layering, lnet: HEAD) 
     b_winnt_port)
-        ldiskfstag="b1_8_iam"
+        ldiskfstag="$ldiskfstag_head"
         lnettag="$lustretag"
         ;;
     
@@ -235,6 +240,14 @@ 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"
@@ -242,6 +255,11 @@ case "$lustretag" in
         snmptag="$lustretag"
         ldiskfstag="$lustretag"
         ;;
+
+    b_HEAD_*|b_head_*|b_hd_*)
+        lnettag="b1_x"
+        ldiskfstag="$ldiskfstag_head"
+        ;;
 esac
 
 cvs_cmd libsysio libsysio "$libsysiotag"
@@ -250,6 +268,8 @@ 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"
+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