From 50c28a1eecb10db2ae649b10408f028eac4e9d03 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Thu, 11 Oct 2018 11:50:18 +0800 Subject: 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 Signed-off-by: Bruce Ashfield --- meta-openstack/conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. -- cgit v1.2.3-54-g00ecf