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"
# lnet "User Level Access" development branch
lnettag="b_ula"
lustretag="HEAD"
- ldiskfstag="b1_8_iam"
+ ldiskfstag="$ldiskfstag_head"
;;
- HEAD|b_HEAD_AT|b_head_capa|b_head_interop_disk)
- lnettag="HEAD"
- ldiskfstag="b1_8_iam"
- ;;
-
# 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="b1_8_iam"
+ ldiskfstag="$ldiskfstag_head"
;;
#umds cleanup
# 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"
;;
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"
;;
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"
snmptag="$lustretag"
ldiskfstag="$lustretag"
;;
+
+ b_HEAD_*|b_head_*|b_hd_*)
+ lnettag="b1_x"
+ ldiskfstag="$ldiskfstag_head"
+ ;;
esac
cvs_cmd libsysio libsysio "$libsysiotag"
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"
+hg_cmd lustre/zfs-lustre "$hg_base_url" "$dmutag"
+cvs_cmd libcfs libcfs "$libcfstag"
[ -a ldiskfs/build ] || ln -sf ../build ldiskfs/build