Browse code
Fix lib/oslo to only reference things which exist
The backport of the install from libs infrastructure left some
unwanted bits in lib/oslo that cause cryptic build issues. Remove
that.
Change-Id: If56f64f1305a206e5360ad9b5e3e41db4d60d576
Sean Dague authored on 2014/12/05 22:53:02Showing 3 changed files
| ... | ... |
@@ -22,15 +22,8 @@ set +o xtrace |
| 22 | 22 |
# -------- |
| 23 | 23 |
GITDIR["cliff"]=$DEST/cliff |
| 24 | 24 |
GITDIR["oslo.config"]=$DEST/oslo.config |
| 25 |
-GITDIR["oslo.concurrency"]=$DEST/oslo.concurrency |
|
| 26 |
-GITDIR["oslo.db"]=$DEST/oslo.db |
|
| 27 |
-GITDIR["oslo.i18n"]=$DEST/oslo.i18n |
|
| 28 |
-GITDIR["oslo.log"]=$DEST/oslo.log |
|
| 29 |
-GITDIR["oslo.middleware"]=$DEST/oslo.middleware |
|
| 30 | 25 |
GITDIR["oslo.messaging"]=$DEST/oslo.messaging |
| 31 | 26 |
GITDIR["oslo.rootwrap"]=$DEST/oslo.rootwrap |
| 32 |
-GITDIR["oslo.serialization"]=$DEST/oslo.serialization |
|
| 33 |
-GITDIR["oslo.utils"]=$DEST/oslo.utils |
|
| 34 | 27 |
GITDIR["oslo.vmware"]=$DEST/oslo.vmware |
| 35 | 28 |
GITDIR["pycadf"]=$DEST/pycadf |
| 36 | 29 |
GITDIR["stevedore"]=$DEST/stevedore |
| ... | ... |
@@ -50,16 +43,9 @@ function _do_install_oslo_lib {
|
| 50 | 50 |
# install_oslo() - Collect source and prepare |
| 51 | 51 |
function install_oslo {
|
| 52 | 52 |
_do_install_oslo_lib "cliff" |
| 53 |
- _do_install_oslo_lib "oslo.i18n" |
|
| 54 |
- _do_install_oslo_lib "oslo.utils" |
|
| 55 |
- _do_install_oslo_lib "oslo.serialization" |
|
| 56 | 53 |
_do_install_oslo_lib "oslo.config" |
| 57 |
- _do_install_oslo_lib "oslo.concurrency" |
|
| 58 |
- _do_install_oslo_lib "oslo.log" |
|
| 59 |
- _do_install_oslo_lib "oslo.middleware" |
|
| 60 | 54 |
_do_install_oslo_lib "oslo.messaging" |
| 61 | 55 |
_do_install_oslo_lib "oslo.rootwrap" |
| 62 |
- _do_install_oslo_lib "oslo.db" |
|
| 63 | 56 |
_do_install_oslo_lib "oslo.vmware" |
| 64 | 57 |
_do_install_oslo_lib "pycadf" |
| 65 | 58 |
_do_install_oslo_lib "stevedore" |
| ... | ... |
@@ -243,18 +243,6 @@ GITBRANCH["cliff"]=${CLIFF_BRANCH:-master}
|
| 243 | 243 |
GITREPO["oslo.config"]=${OSLOCFG_REPO:-${GIT_BASE}/openstack/oslo.config.git}
|
| 244 | 244 |
GITBRANCH["oslo.config"]=${OSLOCFG_BRANCH:-master}
|
| 245 | 245 |
|
| 246 |
-# oslo.db |
|
| 247 |
-GITREPO["oslo.db"]=${OSLODB_REPO:-${GIT_BASE}/openstack/oslo.db.git}
|
|
| 248 |
-GITBRANCH["oslo.db"]=${OSLODB_BRANCH:-master}
|
|
| 249 |
- |
|
| 250 |
-# oslo.i18n |
|
| 251 |
-GITREPO["oslo.i18n"]=${OSLOI18N_REPO:-${GIT_BASE}/openstack/oslo.i18n.git}
|
|
| 252 |
-GITBRANCH["oslo.i18n"]=${OSLOI18N_BRANCH:-master}
|
|
| 253 |
- |
|
| 254 |
-# oslo.log |
|
| 255 |
-GITREPO["oslo.log"]=${OSLOLOG_REPO:-${GIT_BASE}/openstack/oslo.log.git}
|
|
| 256 |
-GITBRANCH["oslo.log"]=${OSLOLOG_BRANCH:-master}
|
|
| 257 |
- |
|
| 258 | 246 |
# oslo.messaging |
| 259 | 247 |
GITREPO["oslo.messaging"]=${OSLOMSG_REPO:-${GIT_BASE}/openstack/oslo.messaging.git}
|
| 260 | 248 |
GITBRANCH["oslo.messaging"]=${OSLOMSG_BRANCH:-master}
|
| ... | ... |
@@ -27,7 +27,7 @@ for i in $TOP/lib/*; do |
| 27 | 27 |
fi |
| 28 | 28 |
done |
| 29 | 29 |
|
| 30 |
-ALL_LIBS="python-novaclient oslo.config pbr python-troveclient python-keystoneclient taskflow pycadf python-glanceclient python-ironicclient tempest-lib oslo.messaging oslo.log cliff python-heatclient stevedore python-cinderclient oslo.db oslo.vmware keystonemiddleware python-saharaclient django_openstack_auth python-openstackclient oslo.rootwrap oslo.i18n python-ceilometerclient python-swiftclient python-neutronclient" |
|
| 30 |
+ALL_LIBS="python-novaclient oslo.config pbr python-troveclient python-keystoneclient taskflow pycadf python-glanceclient python-ironicclient tempest-lib oslo.messaging cliff python-heatclient stevedore python-cinderclient oslo.vmware keystonemiddleware python-saharaclient django_openstack_auth python-openstackclient oslo.rootwrap python-ceilometerclient python-swiftclient python-neutronclient" |
|
| 31 | 31 |
|
| 32 | 32 |
# Generate the above list with |
| 33 | 33 |
# echo ${!GITREPO[@]}
|