X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2Fbuildcvs;h=67b473215e5378d39796fe4613664aed4245e2ca;hp=f8d2e564e1e9869d3e809d802ba5a6101d94edfb;hb=945badb1444ff5f2cf6d171607f417281022b4fd;hpb=58fa00472edb92e5cef936727774625b47e70ec3

diff --git a/build/buildcvs b/build/buildcvs
index f8d2e56..67b4732 100644
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -1,9 +1,10 @@
 # This file is sourced by lustre/lustrecvs
 
-portalstag="HEAD"
+portalstag=""
 lnettag="HEAD"
 libsysiotag="HEAD"
-snmptag=""
+snmptag="HEAD"
+ldiskfstag="HEAD"
 
 export LC_COLLATE=C
 
@@ -20,52 +21,40 @@ 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
+    # entry here.
+
     b1_2)
         portalstag="b1_2"
+        lnettag=""
+        libsysiotag=""
+        snmptag=""
         ;;
 
     b1_4_atime_update)
-        snmptag="HEAD"
         portalstag="b_hd_newconfig"
-        lnettag="b_hd_newconfig"
-	;;
+        ;;
 
     b1_4_join)
-        snmptag="HEAD"
         portalstag="b_hd_newconfig"
-        lnettag="b_hd_newconfig"
         ;;
 
     b1_4_lfs_df)
-        snmptag="HEAD"
         portalstag="b_hd_newconfig"
-        lnettag="b_hd_newconfig"
-	;;
+        ;;
 
     b1_4_lov_lvb_cleanup)
-        snmptag="HEAD"
         portalstag="b_hd_newconfig"
-        lnettag="b_hd_newconfig"
-	;;
+        ;;
 
     b1_4_next_recovery_transno)
-        snmptag="HEAD"
         portalstag="b_hd_newconfig"
-        lnettag="b_hd_newconfig"
-	;;
-	
-    b1_4 | b1_4_*)
-        snmptag="HEAD"
-        portalstag="b_hd_newconfig"
-        lnettag="b_hd_newconfig"
         ;;
 
-    b1_5 | b1_5_*)
-        snmptag="HEAD"
-        portalstag="b_hd_newconfig"
-        lnettag="b_hd_newconfig"
-	# XXX temorary tag until b1_5* is updated from b1_4 liblustre
-	libsysiotag="HEAD_RELEASE_1_4_6_LAND_PARENT_20060223_1455"
+    b_new_cmd)
+	portalstag="b_new_portals"
+        # lnettag="b_lnet_tmp"
         ;;
 
     b_cmd*)
@@ -73,11 +62,9 @@ case "$lustretag" in
         ;;
 
     b_iam*)
-        snmptag="HEAD"
         portalstag="b_hd_newconfig"
-        lnettag="b_hd_newconfig"
-	# XXX temorary tag until b_iam* is updated from b1_4 liblustre
-	libsysiotag="HEAD_RELEASE_1_4_6_LAND_PARENT_20060223_1455"
+        # XXX temorary tag until b_iam* is updated from b1_4 liblustre
+        libsysiotag="HEAD_RELEASE_1_4_6_LAND_PARENT_20060223_1455"
         ;;
 
     b_ioprovement)
@@ -117,35 +104,86 @@ case "$lustretag" in
         portalstag="b_ptlrpc_cleanup"
         ;;
 
-    # starting with 1_4_6, we have a tagged lnet too
-    b_release_1_4_[6-9]*)
+    b_self_test)
+        # lnet self test development branch
+	lnettag="b_self_test"
+	lustretag="HEAD"
+	;;
+
+    b_mpilnd)
+        # lnet mpilnd development branch
+	lnettag="b_mpilnd"
+	lustretag="HEAD"
+	;;
+
+    # before 1_4_6, we didn't have lnet or snmp
+    b_release_1_2_*|b_release_1_4_[0-5])
         portalstag="$lustretag"
+        lnettag=""
         libsysiotag="$lustretag"
+        snmptag=""
+        ;;
+
+    b_release_1_4_6-patchless)
+        portalstag=b_release_1_4_6
+        lnettag=b_release_1_4_6-patchless
+        libsysiotag=b_release_1_4_6
+        snmptag=b_release_1_4_6
+        ;;
+
+    b_release_1_4_6)
+        portalstag="$lustretag"
         lnettag="$lustretag"
+        libsysiotag="$lustretag"
+        snmptag="$lustretag"
         ;;
 
+    # all later b_release_* tags
     b_release_*)
-        portalstag="$lustretag"
+        lnettag="$lustretag"
         libsysiotag="$lustretag"
+        snmptag="$lustretag"
+        ;;
+
+    # uOSS
+    b_uoss)
+        lnettag="b_uoss"
+        ;;
+    
+    # CMD3
+    b_post_cmd3|b1_8_gssfix)
+        ldiskfstag="b1_8_iam"
         ;;
 
     # v1.0-v1.3, v1.4.0-v1.4.2
-    v1_[0-3]_*|v1_4_[0-2]*)
+    v1_[0-3]_*|v1_4_[0-2]|v1_4_[0-2]_*)
         portalstag="$lustretag"
+        lnettag=""
         libsysiotag="$lustretag"
+        snmptag=""
         ;;
 
     # v1.4.3-v1.4.5, v1.4.5.1 - v1.4.5.9
     v1_4_[3-5]|v1_4_[3-4]_*|v1_4_5_[1-9]|cray_2005*)
         portalstag="$lustretag"
+        lnettag=""
+        libsysiotag="$lustretag"
+        snmptag="$lustretag"
+        ;;
+
+    # v1.4.6, v1.4.6.[1-91]
+    v1_4_6_[1-9]|v1_4_6_9[01])
+        portalstag="$lustretag"
+        lnettag=""
         libsysiotag="$lustretag"
+        snmptag="$lustretag"
         ;;
 
     # all later v* tags
     v[1-9]*)
-        portalstag="$lustretag"
         lnettag="$lustretag"
         libsysiotag="$lustretag"
+        snmptag="$lustretag"
         ;;
 esac
 
@@ -154,3 +192,6 @@ cvs_cmd portals portals "$portalstag"
 cvs_cmd lnet lnet "$lnettag"
 cvs_cmd snmp lustre-snmp "$snmptag"
 cvs_cmd lustre lustre-core "$lustretag"
+cvs_cmd ldiskfs ldiskfs "$ldiskfstag"
+
+[ -a ldiskfs/build ] || ln -sf ../build ldiskfs/build