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
Get some diagnostic output from expect to see if I can see why this fails on
[fs/lustre-release.git]
/
build
/
buildcvs
diff --git
a/build/buildcvs
b/build/buildcvs
index
6371e85
..
c57ef2e
100644
(file)
--- a/
build/buildcvs
+++ b/
build/buildcvs
@@
-3,7
+3,7
@@
portalstag="HEAD"
lnettag="HEAD"
libsysiotag="HEAD"
portalstag="HEAD"
lnettag="HEAD"
libsysiotag="HEAD"
-snmptag=""
+snmptag="
HEAD
"
export LC_COLLATE=C
export LC_COLLATE=C
@@
-22,40
+22,42
@@
case "$lustretag" in
# keep this list sorted alphabetically!
b1_2)
portalstag="b1_2"
# keep this list sorted alphabetically!
b1_2)
portalstag="b1_2"
+ lnettag=""
+ libsysiotag=""
+ snmptag=""
;;
;;
- b1_4_next_recovery_transno)
- snmptag="HEAD"
+ b1_4_atime_update)
+ portalstag="b_hd_newconfig"
+ lnettag="b_hd_newconfig"
+ ;;
+
+ b1_4_join)
+ portalstag="b_hd_newconfig"
+ lnettag="b_hd_newconfig"
+ ;;
+
+ b1_4_lfs_df)
portalstag="b_hd_newconfig"
portalstag="b_hd_newconfig"
- l
ibsysiotag="b_release_1_4_6
"
- ;;
+ l
nettag="b_hd_newconfig
"
+
;;
b1_4_lov_lvb_cleanup)
b1_4_lov_lvb_cleanup)
- snmptag="HEAD"
portalstag="b_hd_newconfig"
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"
+ lnettag="b_hd_newconfig"
;;
;;
- b1_4 | b1_4_*)
- snmptag="HEAD"
+ b1_4_next_recovery_transno)
portalstag="b_hd_newconfig"
lnettag="b_hd_newconfig"
;;
portalstag="b_hd_newconfig"
lnettag="b_hd_newconfig"
;;
- b1_4_join)
- snmptag="HEAD"
+ b1_4 | b1_4_*)
portalstag="b_hd_newconfig"
lnettag="b_hd_newconfig"
;;
b1_5 | b1_5_*)
portalstag="b_hd_newconfig"
lnettag="b_hd_newconfig"
;;
b1_5 | b1_5_*)
- snmptag="HEAD"
portalstag="b_hd_newconfig"
lnettag="b_hd_newconfig"
;;
portalstag="b_hd_newconfig"
lnettag="b_hd_newconfig"
;;
@@
-64,8
+66,15
@@
case "$lustretag" in
portalstag="$lustretag"
;;
portalstag="$lustretag"
;;
+ b_iam*)
+ portalstag="b_hd_newconfig"
+ lnettag="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)
b_ioprovement)
- portalstag=
b_ioprovement
+ portalstag=
"b_ioprovement"
;;
b_newconfig_rdmarouting)
;;
b_newconfig_rdmarouting)
@@
-101,24
+110,36
@@
case "$lustretag" in
portalstag="b_ptlrpc_cleanup"
;;
portalstag="b_ptlrpc_cleanup"
;;
- b_release_*)
- portalstag=$lustretag
+ # 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=""
;;
;;
- RELEASE_1_4_6_B1_4_JOIN_LAND_PARENT_20051208_1641)
- lnettag="b_hd_newconfig"
- portalstag="b_hd_newconfig"
+ # all later b_release_* tags
+ b_release_*)
+ portalstag="$lustretag"
+ lnettag="$lustretag"
+ libsysiotag="$lustretag"
+ snmptag="$lustretag"
;;
# v1.0-v1.3, v1.4.0-v1.4.2
;;
# 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"
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"
;;
# 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"
libsysiotag="$lustretag"
+ snmptag="$lustretag"
;;
# all later v* tags
;;
# all later v* tags
@@
-126,6
+147,7
@@
case "$lustretag" in
portalstag="$lustretag"
lnettag="$lustretag"
libsysiotag="$lustretag"
portalstag="$lustretag"
lnettag="$lustretag"
libsysiotag="$lustretag"
+ snmptag="$lustretag"
;;
esac
;;
esac