[meta-openstack][PATCH] layer.conf: set PREFERRED_VERSION for python-networkx

[meta-openstack][PATCH] layer.conf: set PREFERRED_VERSION for python-networkx

[mingli.yu]

From: Mingli Yu <Mingli.Yu@windriver.com>

Only set PREFERRED_VERSION for python-networkx
when the openstack distro is enabled

Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
---
 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 126f37f..2dceb47 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"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
-- 
2.7.4

Re: [meta-openstack][PATCH] layer.conf: set PREFERRED_VERSION for python-networkx

[Bruce Ashfield]

On Wed, Oct 10, 2018 at 5:31 AM <mingli.yu@windriver.com> wrote:
>
> From: Mingli Yu <Mingli.Yu@windriver.com>
>
> Only set PREFERRED_VERSION for python-networkx
> when the openstack distro is enabled

If we are introducing a distro feature for openstack, there needs to
be a warning
generated if the layer is included, but the distro feature is not set.

That preserves the existing behaviour (enabled by default) by letting the user
know what they must enable in their config to get openstack building and the
right versions.

We should also have a variable to inhibit the warning for those that want the
layer, and know they haven't enabled it.

See meta-virtualization for an example of how to do both.

Bruce

>
> Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
> ---
>  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 126f37f..2dceb47 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"
>
>  LICENSE_PATH += "${LAYERDIR}/licenses"
> --
> 2.7.4
>


-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"