aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMingli Yu <Mingli.Yu@windriver.com>2018-10-11 11:50:18 +0800
committerBruce Ashfield <bruce.ashfield@windriver.com>2018-10-11 14:46:32 -0400
commit50c28a1eecb10db2ae649b10408f028eac4e9d03 (patch)
tree8c4e11e3ed1243a455c10fb18ed8de45ce854cab
parent5b4e2a5ff9b36b6b244bfa0861bc8f8da16a832f (diff)
downloadmeta-cloud-services-50c28a1eecb10db2ae649b10408f028eac4e9d03.tar.gz
meta-cloud-services-50c28a1eecb10db2ae649b10408f028eac4e9d03.tar.bz2
meta-cloud-services-50c28a1eecb10db2ae649b10408f028eac4e9d03.zip
layer.conf: set PREFERRED_VERSION for python-networkx
Only set PREFERRED_VERSION for python-networkx when the openstack distro is enabled Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--meta-openstack/conf/layer.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-openstack/conf/layer.conf b/meta-openstack/conf/layer.conf
index 9ca806e..ebff000 100644
--- a/meta-openstack/conf/layer.conf
+++ b/meta-openstack/conf/layer.conf
@@ -32,7 +32,7 @@ PREFERRED_VERSION_python-sqlalchemy = "1.0.16"
PREFERRED_VERSION_python-eventlet = "0.20.0"
PREFERRED_VERSION_python-warlock = "1.2.0"
PREFERRED_VERSION_python-jsonschema = "2.6.0"
-PREFERRED_VERSION_python-networkx = "1.11"
+PREFERRED_VERSION_python-networkx = "${@bb.utils.contains('DISTRO_FEATURES', 'openstack', '1.11', '', d)}"
PREFERRED_VERSION_python-oslo.i18n = "3.17.0+gitAUTOINC+f2729cd36f"
# Sanity check for meta-openstack layer.