Ensure both lists of oslo libraries are sorted and
add the missing oslo.context in install_oslo method
Change-Id: I5b849c97b681e65425304e05534a61140e4e1fda
| ... | ... |
@@ -21,14 +21,14 @@ set +o xtrace |
| 21 | 21 |
# Defaults |
| 22 | 22 |
# -------- |
| 23 | 23 |
GITDIR["cliff"]=$DEST/cliff |
| 24 |
-GITDIR["oslo.config"]=$DEST/oslo.config |
|
| 25 | 24 |
GITDIR["oslo.concurrency"]=$DEST/oslo.concurrency |
| 25 |
+GITDIR["oslo.config"]=$DEST/oslo.config |
|
| 26 | 26 |
GITDIR["oslo.context"]=$DEST/oslo.context |
| 27 | 27 |
GITDIR["oslo.db"]=$DEST/oslo.db |
| 28 | 28 |
GITDIR["oslo.i18n"]=$DEST/oslo.i18n |
| 29 | 29 |
GITDIR["oslo.log"]=$DEST/oslo.log |
| 30 |
-GITDIR["oslo.middleware"]=$DEST/oslo.middleware |
|
| 31 | 30 |
GITDIR["oslo.messaging"]=$DEST/oslo.messaging |
| 31 |
+GITDIR["oslo.middleware"]=$DEST/oslo.middleware |
|
| 32 | 32 |
GITDIR["oslo.rootwrap"]=$DEST/oslo.rootwrap |
| 33 | 33 |
GITDIR["oslo.serialization"]=$DEST/oslo.serialization |
| 34 | 34 |
GITDIR["oslo.utils"]=$DEST/oslo.utils |
| ... | ... |
@@ -54,16 +54,17 @@ function _do_install_oslo_lib {
|
| 54 | 54 |
# install_oslo() - Collect source and prepare |
| 55 | 55 |
function install_oslo {
|
| 56 | 56 |
_do_install_oslo_lib "cliff" |
| 57 |
- _do_install_oslo_lib "oslo.i18n" |
|
| 58 |
- _do_install_oslo_lib "oslo.utils" |
|
| 59 |
- _do_install_oslo_lib "oslo.serialization" |
|
| 60 |
- _do_install_oslo_lib "oslo.config" |
|
| 61 | 57 |
_do_install_oslo_lib "oslo.concurrency" |
| 58 |
+ _do_install_oslo_lib "oslo.config" |
|
| 59 |
+ _do_install_oslo_lib "oslo.context" |
|
| 60 |
+ _do_install_oslo_lib "oslo.db" |
|
| 61 |
+ _do_install_oslo_lib "oslo.i18n" |
|
| 62 | 62 |
_do_install_oslo_lib "oslo.log" |
| 63 |
- _do_install_oslo_lib "oslo.middleware" |
|
| 64 | 63 |
_do_install_oslo_lib "oslo.messaging" |
| 64 |
+ _do_install_oslo_lib "oslo.middleware" |
|
| 65 | 65 |
_do_install_oslo_lib "oslo.rootwrap" |
| 66 |
- _do_install_oslo_lib "oslo.db" |
|
| 66 |
+ _do_install_oslo_lib "oslo.serialization" |
|
| 67 |
+ _do_install_oslo_lib "oslo.utils" |
|
| 67 | 68 |
_do_install_oslo_lib "oslo.vmware" |
| 68 | 69 |
_do_install_oslo_lib "pycadf" |
| 69 | 70 |
_do_install_oslo_lib "stevedore" |