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
Branch HEAD
[fs/lustre-release.git]
/
build
/
buildcvs
diff --git
a/build/buildcvs
b/build/buildcvs
index
4d51d15
..
c8d472d
100644
(file)
--- a/
build/buildcvs
+++ b/
build/buildcvs
@@
-5,6
+5,8
@@
lnettag="HEAD"
libsysiotag="HEAD"
snmptag="HEAD"
ldiskfstag="HEAD"
libsysiotag="HEAD"
snmptag="HEAD"
ldiskfstag="HEAD"
+dmutag=""
+hg_base_url="http://www.wizy.org/mercurial"
export LC_COLLATE=C
export LC_COLLATE=C
@@
-164,8
+166,15
@@
case "$lustretag" in
lustretag="HEAD"
;;
lustretag="HEAD"
;;
+ b_ula)
+ # lnet "User Level Access" development branch
+ lnettag="b_ula"
+ lustretag="HEAD"
+ ldiskfstag="b1_8_iam"
+ ;;
+
# CMD3
# CMD3
- HEAD|b_post_cmd3|b
1_8_gssfix|b_new_cmd_sles10|b1_6_head_sync|b1_8_dir_ra|b_colibri_devel|b_mixed_layout_req|b_remote_acl|b_mount_per
m)
+ HEAD|b_post_cmd3|b
_HEAD_AT|b_new_cmd_sles10|b1_6_head_sync|b1_8_dir_ra|b_mixed_layout_req|b_mount_perm|b1_8_gns|b1_8_quota|b1_8_interop_server|b_so
m)
# Update b1_8 above when changing this.
ldiskfstag="b1_8_iam"
;;
# Update b1_8 above when changing this.
ldiskfstag="b1_8_iam"
;;
@@
-174,6
+183,15
@@
case "$lustretag" in
b_hd_dmu)
lnettag="b_uoss"
ldiskfstag="b1_8_iam"
b_hd_dmu)
lnettag="b_uoss"
ldiskfstag="b1_8_iam"
+ dmutag="zfs-lustre"
+ ;;
+
+ # uOSS o2iblnd
+ b_uoss_o2iblnd)
+ lnettag="b_uoss_o2iblnd"
+ lustretag="b_hd_dmu"
+ ldiskfstag="b1_8_iam"
+ dmutag="zfs-lustre"
;;
# client io stack cleanup
;;
# client io stack cleanup
@@
-220,5
+238,6
@@
cvs_cmd lnet lnet "$lnettag"
cvs_cmd snmp lustre-snmp "$snmptag"
cvs_cmd lustre lustre-core "$lustretag"
cvs_cmd ldiskfs ldiskfs "$ldiskfstag"
cvs_cmd snmp lustre-snmp "$snmptag"
cvs_cmd lustre lustre-core "$lustretag"
cvs_cmd ldiskfs ldiskfs "$ldiskfstag"
+hg_cmd zfs-lustre "$hg_base_url" "$dmutag"
[ -a ldiskfs/build ] || ln -sf ../build ldiskfs/build
[ -a ldiskfs/build ] || ln -sf ../build ldiskfs/build