The original commit had a mistake in it giving the impression 3.20.0 was on the stable/pike branch when in fact it was not. We want all openstack components on stable/pike so this uprev is not valid and we must bring back the old version and set it as the PREFERRED_VERSION.
Signed-off-by: Mark Asselstine <mark.asselst...@windriver.com> --- meta-openstack/conf/layer.conf | 2 ++ .../python/python-oslo.i18n_3.20.0.bb | 33 ++++++++++++++++++++++ .../python/python-oslo.i18n_git.bb | 6 ++-- 3 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 meta-openstack/recipes-devtools/python/python-oslo.i18n_3.20.0.bb diff --git a/meta-openstack/conf/layer.conf b/meta-openstack/conf/layer.conf index c5884c5..2565b92 100644 --- a/meta-openstack/conf/layer.conf +++ b/meta-openstack/conf/layer.conf @@ -23,4 +23,6 @@ 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-oslo.i18n = "3.17.0+gitAUTOINC+f2729cd36f" + LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-openstack/recipes-devtools/python/python-oslo.i18n_3.20.0.bb b/meta-openstack/recipes-devtools/python/python-oslo.i18n_3.20.0.bb new file mode 100644 index 0000000..76a8b53 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python-oslo.i18n_3.20.0.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "oslo.i18n library" +HOMEPAGE = "http://launchpad.net/oslo" +SECTION = "devel/python" +LICENSE = "Apache-2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" + +SRCREV = "172e20b10981069c36b0f42377e5b4fbe22a9864" + +SRCNAME = "oslo.i18n" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master" + +S = "${WORKDIR}/git" + +inherit setuptools + +# DEPENDS_default: python-pip + +DEPENDS += " \ + python-pip \ + python-pbr \ + " + +# Satisfy setup.py 'setup_requires' +DEPENDS += " \ + python-pbr-native \ + " + +# RDEPENDS_default: +RDEPENDS_${PN} += " \ + python-babel \ + python-pbr \ + python-six \ + " diff --git a/meta-openstack/recipes-devtools/python/python-oslo.i18n_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.i18n_git.bb index 9fe3d00..9f7ddc5 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.i18n_git.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.i18n_git.bb @@ -4,11 +4,11 @@ SECTION = "devel/python" LICENSE = "Apache-2" LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" -PV = "3.20.0+git${SRCPV}" -SRCREV = "172e20b10981069c36b0f42377e5b4fbe22a9864" +PV = "3.17.0+git${SRCPV}" +SRCREV = "f2729cd36f8694a6ec53a0e700599ddf4427440d" SRCNAME = "oslo.i18n" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" S = "${WORKDIR}/git" -- 2.7.4 -- _______________________________________________ meta-virtualization mailing list meta-virtualization@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-virtualization