# This file is sourced by lustre/lustrecvs
-portalstag="HEAD"
-lnettag="HEAD"
+portalstag=""
+lnettag="b1_x"
libsysiotag="HEAD"
-snmptag=""
+snmptag="HEAD"
+ldiskfstag="HEAD"
+ldiskfstag_head="b1_8_iam"
+lustreiokittag="HEAD"
+libcfstag="b1_x"
+dmutag=""
+hg_base_url="http://www.wizy.org/mercurial"
export LC_COLLATE=C
# this is the branch table
# keep this list sorted alphabetically!
+
+ # Note these are "specials" -- branches using lnet b1_x don't need an
+ # entry here.
+
b1_2)
portalstag="b1_2"
+ lnettag=""
+ libsysiotag=""
+ snmptag=""
;;
- b1_4_next_recovery_transno)
- snmptag="HEAD"
- portalstag="b_hd_newconfig"
- libsysiotag="b_release_1_4_6"
- ;;
-
- b1_4_lfs_df)
- snmptag="HEAD"
- portalstag="b_hd_newconfig"
- libsysiotag="b_release_1_4_6"
- ;;
-
b1_4_atime_update)
- snmptag="HEAD"
portalstag="b_hd_newconfig"
- libsysiotag="b_release_1_4_6"
- ;;
+ ;;
- b1_4_lov_lvb_cleanup)
- snmptag="HEAD"
+ b1_4_join)
portalstag="b_hd_newconfig"
- libsysiotag="b_release_1_4_6"
- ;;
-
- b1_4_rhel4_22)
- snmptag="HEAD"
- portalstag="b_release_1_4_6"
- lnettag="b_release_1_4_6"
;;
- b1_4 | b1_4_*)
- snmptag="HEAD"
+ b1_4_lfs_df)
portalstag="b_hd_newconfig"
- lnettag="b_hd_newconfig"
;;
- b1_4_join)
- snmptag="HEAD"
+ b1_4_lov_lvb_cleanup)
portalstag="b_hd_newconfig"
- lnettag="b_hd_newconfig"
;;
- b1_5 | b1_5_*)
- snmptag="HEAD"
+ b1_4_next_recovery_transno)
portalstag="b_hd_newconfig"
- lnettag="b_hd_newconfig"
;;
b_cmd*)
portalstag="$lustretag"
;;
+ b_iam*)
+ portalstag="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"
+ ;;
+
b_ioprovement)
- portalstag=b_ioprovement
+ portalstag="b_ioprovement"
+ ;;
+
+ b_mpilnd)
+ # lnet mpilnd development branch
+ lnettag="b_mpilnd"
+ lustretag="HEAD"
+ ;;
+
+ b_new_cmd)
+ portalstag="b_new_portals"
+ # lnettag="b_lnet_tmp"
;;
b_newconfig_rdmarouting)
portalstag="b_port_test"
;;
+ b_ptlrpc_cleanup)
+ portalstag="b_ptlrpc_cleanup"
+ ;;
+
b_ptl_smallfix)
portalstag="b_ptl_smallfix"
lustretag="b1_4"
;;
- b_ptlrpc_cleanup)
- portalstag="b_ptlrpc_cleanup"
+ # 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)
+ portalstag="$lustretag"
+ lnettag="$lustretag"
+ libsysiotag="$lustretag"
+ snmptag="$lustretag"
;;
+ 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
+ ;;
+
+ # all later b_release_* tags
b_release_*)
- portalstag=$lustretag
+ lnettag="$lustretag"
+ libsysiotag="$lustretag"
+ snmptag="$lustretag"
+ ldiskfstag="$lustretag"
;;
- RELEASE_1_4_6_B1_4_JOIN_LAND_PARENT_20051208_1641)
- lnettag="b_hd_newconfig"
- portalstag="b_hd_newconfig"
+ b_self_test)
+ # lnet self test development branch
+ lnettag="b_self_test"
+ lustretag="HEAD"
+ ;;
+
+ b_usocklnd)
+ # lnet usocklnd development branch
+ lnettag="b_usocklnd"
+ lustretag="b1_6_usocklnd"
+ ;;
+
+ b_uo2iblnd)
+ # lnet u-o2iblnd development branch
+ lnettag="b_uo2iblnd"
+ lustretag="HEAD"
+ ;;
+
+ b_ula)
+ # lnet "User Level Access" development branch
+ lnettag="b_ula"
+ lustretag="HEAD"
+ ldiskfstag="$ldiskfstag_head"
+ ;;
+
+ # 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_head_interop_disk)
+ # Update b1_8 above when changing this.
+ ldiskfstag="$ldiskfstag_head"
+ ;;
+
+ #umds cleanup
+ b_hd_umds_cln2)
+ ldiskfstag="b1_8_iam_dynlock"
+ ;;
+
+ # uOSS
+ b_hd_dmu)
+ lnettag="b_uoss"
+ ldiskfstag="$ldiskfstag_head"
+ dmutag="zfs-lustre"
+ ;;
+
+ # uMDS
+ b_dmu_umds)
+ lnettag="b_uoss_umds"
+ ldiskfstag="$ldiskfstag_head"
+ dmutag="zfs-lustre"
+ ;;
+
+ # uOSS o2iblnd
+ b_uoss_o2iblnd)
+ lnettag="b_uoss_o2iblnd"
+ lustretag="b_hd_dmu"
+ ldiskfstag="$ldiskfstag_head"
+ dmutag="zfs-lustre"
;;
+ # 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)
+ b_winnt_port)
+ ldiskfstag="$ldiskfstag_head"
+ lnettag="$lustretag"
+ ;;
+
# 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"
+ ;;
+
+ # 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]*)
- portalstag="$lustretag"
lnettag="$lustretag"
libsysiotag="$lustretag"
+ snmptag="$lustretag"
+ ldiskfstag="$lustretag"
+ ;;
+
+ b_HEAD_*|b_head_*|b_hd_*)
+ lnettag="b1_x"
+ ldiskfstag="$ldiskfstag_head"
;;
esac
cvs_cmd lnet lnet "$lnettag"
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 lustre/zfs-lustre "$hg_base_url" "$dmutag"
+cvs_cmd libcfs libcfs "$libcfstag"
+
+[ -a ldiskfs/build ] || ln -sf ../build ldiskfs/build