merged Bruce On Wed, Oct 10, 2018 at 11:51 PM <[email protected]> wrote: > > From: Mingli Yu <[email protected]> > > Only set PREFERRED_VERSION for python-networkx > when the openstack distro is enabled > > Signed-off-by: Mingli Yu <[email protected]> > --- > 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 f322bcd..598e157 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. > -- > 2.7.4 >
-- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end" -- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
