summaryrefslogtreecommitdiffstats
path: root/meta-openstack
diff options
context:
space:
mode:
authorJosep Puigdemont <josep.puigdemont@enea.com>2015-12-02 17:32:10 +0100
committerBruce Ashfield <bruce.ashfield@windriver.com>2015-12-07 10:52:38 -0500
commit7334feebc35a4694b39d3cf4904fce3c908c5fc8 (patch)
treebb44739ed36cb37d0280bfe0beb687a8596604f3 /meta-openstack
parentcad5b64463ffea0adc7819d8d30e86b9f02814a3 (diff)
downloadmeta-cloud-services-7334feebc35a4694b39d3cf4904fce3c908c5fc8.tar.gz
layer.conf: prefer python-six 1.9.0
Openstack Kilo requires python-six 1.9.0, or older, but meta-virtualization provides an older version of python-six, which gets selected due to higher priority. Solve this as a preferred version in layer.conf. Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack')
-rw-r--r--meta-openstack/conf/layer.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta-openstack/conf/layer.conf b/meta-openstack/conf/layer.conf
index 2b3a00d..93b03db 100644
--- a/meta-openstack/conf/layer.conf
+++ b/meta-openstack/conf/layer.conf
@@ -14,3 +14,4 @@ BB_DANGLINGAPPENDS_WARNONLY ?= "true"
14PREFERRED_VERSION_python-greenlet = "0.4.1" 14PREFERRED_VERSION_python-greenlet = "0.4.1"
15PREFERRED_VERSION_python-sqlalchemy = "0.9.7" 15PREFERRED_VERSION_python-sqlalchemy = "0.9.7"
16PREFERRED_VERSION_python-pexpect = "3.3" 16PREFERRED_VERSION_python-pexpect = "3.3"
17PREFERRED_VERSION_python-six = "1.9.0"