Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update buildcvs to support b2_9-bld* branches.
[fs/lustre-release.git]
/
build
/
buildcvs
diff --git
a/build/buildcvs
b/build/buildcvs
index
4347e79
..
f883a15
100644
(file)
--- a/
build/buildcvs
+++ b/
build/buildcvs
@@
-171,6
+171,14
@@
case "$lustretag" in
libcfstag="HEAD"
;;
libcfstag="HEAD"
;;
+ b_hd_lnet_smp_concur)
+ # LNet grained locking and SMP concurrency branch
+ lnettag="b_hd_lnet_smp_concur"
+ ldiskfstag="$ldiskfstag_head"
+ lustretag="HEAD"
+ libcfstag="HEAD"
+ ;;
+
b_hd_o2ib_new_proto)
# LNet branch for new o2iblnd protocol (15983, 13621, 14425, 14358)
lnettag="b_hd_o2ib_new_proto"
b_hd_o2ib_new_proto)
# LNet branch for new o2iblnd protocol (15983, 13621, 14425, 14358)
lnettag="b_hd_o2ib_new_proto"
@@
-240,10
+248,18
@@
case "$lustretag" in
libcfstag="HEAD"
;;
libcfstag="HEAD"
;;
+ # HEAD cmd fixes
+ b_head_cmd)
+ lnettag="HEAD"
+ ldiskfstag="$ldiskfstag_head"
+ libcfstag="HEAD"
+ ;;
+
# windows client porting (lustre: b_client_io_layering, lnet: HEAD)
b_winnt_port)
ldiskfstag="$ldiskfstag_head"
# windows client porting (lustre: b_client_io_layering, lnet: HEAD)
b_winnt_port)
ldiskfstag="$ldiskfstag_head"
- lnettag="$lustretag"
+ lnettag="b_winnt_port"
+ libcfstag="b_winnt_port"
;;
# v1.0-v1.3, v1.4.0-v1.4.2
;;
# v1.0-v1.3, v1.4.0-v1.4.2
@@
-279,7
+295,7
@@
case "$lustretag" in
# Branches that have been updated to include
# the libcfs split should be added here
# Branches that have been updated to include
# the libcfs split should be added here
- HEAD|b_head_quota)
+ HEAD|b_head_quota
|b_hd_comp_fld
)
lnettag="HEAD"
ldiskfstag="$ldiskfstag_head"
libcfstag="HEAD"
lnettag="HEAD"
ldiskfstag="$ldiskfstag_head"
libcfstag="HEAD"
@@
-297,6
+313,12
@@
case "$lustretag" in
libcfstag="b_head_procfs"
;;
libcfstag="b_head_procfs"
;;
+ b2_0-bld*)
+ lnettag="$lustretag"
+ ldiskfstag="$ldiskfstag_head"
+ libcfstag="$lustretag"
+ ;;
+
# all later v* tags
v[1-9]*)
lnettag="$lustretag"
# all later v* tags
v[1-9]*)
lnettag="$lustretag"