Branch b_hd_dmu

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

diff --git a/build/buildcvs b/build/buildcvs
index e2ad951..913dd59 100644 (file)
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -7,7 +7,7 @@ snmptag="HEAD"
 ldiskfstag="HEAD"
 ldiskfstag_head="b1_8_iam"
 lustreiokittag="HEAD"
-libcfstag=""
+libcfstag="b1_x"
 dmutag=""
 hg_base_url="http://www.wizy.org/mercurial"
 
@@ -171,7 +171,7 @@ case "$lustretag" in
        ;;
 
     # CMD3
-    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_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="$ldiskfstag_head"
         ;;
@@ -205,7 +205,9 @@ case "$lustretag" in
 
     # client io stack cleanup
     b_client_io_layering)
+        lnettag="HEAD"
         ldiskfstag="$ldiskfstag_head"
+        libcfstag="HEAD"
         ;;
     
     # windows client porting (lustre: b_client_io_layering, lnet: HEAD) 
@@ -238,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"
@@ -250,14 +260,6 @@ case "$lustretag" in
         lnettag="b1_x"
         ldiskfstag="$ldiskfstag_head"
         ;;
-
-    # Branches that have been updated to include
-    # the libcfs split should be added here
-    HEAD)
-        lnettag="HEAD"
-        ldiskfstag="$ldiskfstag_head"
-        libcfstag="HEAD"
-        ;;
 esac
 
 cvs_cmd libsysio libsysio "$libsysiotag"
@@ -267,9 +269,7 @@ cvs_cmd snmp lustre-snmp "$snmptag"
 cvs_cmd lustre lustre-core "$lustretag"
 cvs_cmd ldiskfs ldiskfs "$ldiskfstag"
 cvs_cmd lustre-iokit lustre-iokit "$lustreiokittag"
-hg_cmd zfs-lustre "$hg_base_url" "$dmutag"
-if [ -n $libcfstag ]; then
-    cvs_cmd libcfs libcfs "$libcfstag"
-fi
+hg_cmd lustre/zfs-lustre "$hg_base_url" "$dmutag"
+cvs_cmd libcfs libcfs "$libcfstag"
 
 [ -a ldiskfs/build ] || ln -sf ../build ldiskfs/build