libsysiotag="HEAD"
snmptag="HEAD"
ldiskfstag="HEAD"
-ldiskfstag_head="b1_8_iam"
+ldiskfstag_head="HEAD"
lustreiokittag="HEAD"
libcfstag="b1_x"
dmutag="" # uDMU
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)
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)
ldiskfstag="$ldiskfstag_head"
libcfstag="HEAD"
spltag="pre-alpha"
- zfstag="top"
+ zfstag="patched"
+ ;;
+ b_kdmu_params)
+ # Identical to HEAD + spl and zfs
+ lnettag="b_hd_params_tree"
+ ldiskfstag="$ldiskfstag_head"
+ libcfstag="b_hd_params_tree"
+ lustretag="b_kdmu_params"
+ spltag="pre-alpha"
+ zfstag="patched"
;;
b_head_libcfs)
hg_cmd lustre/zfs-lustre "$hg_base_url" "$dmutag"
cvs_cmd libcfs libcfs "$libcfstag"
git_cmd spl spl "$spltag" "$git_base_url"
-git_cmd zfs zfs "$zfstag" "$git_base_url"
+git_cmd zfs zfs-tmp "$zfstag" "$git_base_url"
[ -a ldiskfs/build ] || ln -sf ../build ldiskfs/build