b=20298

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

diff --git a/build/buildcvs b/build/buildcvs
index 11eab4d..d8c3c45 100644 (file)
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -5,7 +5,7 @@ lnettag="b1_x"
 libsysiotag="HEAD"
 snmptag="HEAD"
 ldiskfstag="HEAD"
-ldiskfstag_head="b1_8_iam"
+ldiskfstag_head="HEAD"
 lustreiokittag="HEAD"
 libcfstag="b1_x"
 dmutag="" # uDMU
@@ -180,12 +180,12 @@ case "$lustretag" in
         lustretag="b_hd_lustre_smp"
         ;;
 
-    b_hd_o2ib_new_proto)
+    b_hd_md_perf)
         # LNet branch for new o2iblnd protocol (15983, 13621, 14425, 14358)
-        lnettag="b_hd_o2ib_new_proto"
+        lnettag="HD_LNET_SMP_BASE"
         ldiskfstag="$ldiskfstag_head"
-        lustretag="HEAD"
-        libcfstag="HEAD"
+        lustretag="HD_LUSTRE_SMP_BASE"
+        libcfstag="HD_LIBCFS_SMP_BASE"
         ;;
 
     b_ula)
@@ -309,6 +309,14 @@ case "$lustretag" in
         libcfstag="HEAD"
         ;;
 
+    # libcfs name normalization changes
+    b_hd_nn)
+        libcfstag="b_hd_libcfs_nn"
+        lnettag="b_hd_lnet_nn"
+        ldiskfstag="$ldiskfstag_head"
+        lustretag="b_hd_lustre_nn"
+        ;; 
+
     # Branches that have been updated to include
     # the libcfs split should be added here
     HEAD|b_head_capa|b_hd_cfld|b_hd_changelog|b_hd_sptlrpc|HD_SPTLRPC_BASE|b_som|b_hd_recov|b_hd_transapi)