cinder: uprev to havana release

Updating the cinder block storage component to the havana release.
At the same time, we switch to a git based build.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

2 files changed, 8 insertions, 10 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-cinder_2013.1.3.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
index a6a10e5..6e6f31b 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder_2013.1.3.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
@@ -7,16 +7,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 PR = "r0"
 SRCNAME = "cinder"
 
-SRC_URI = "https://launchpad.net/${SRCNAME}/grizzly/${PV}/+download/${SRCNAME}-${PV}.tar.gz \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \
     file://cinder.conf \
     file://cinder.init \
     file://cinder-volume \
         "
 
-SRC_URI[md5sum] = "2bfeacfaea7be5194587bb932dd8f693"
-SRC_URI[sha256sum] = "358ab7fb1cb57ea1f0c1d76e30d45eebb6308a6122b6e6ff6ac3405f51eceb1e"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
+SRCREV="1f99a044580286bf0d927cc7fc7ce3378653aef0"
+PV="2013.2+git${SRCPV}"
+S = "${WORKDIR}/git"
 
 inherit setuptools update-rc.d identity
 
diff --git a/meta-openstack/recipes-devtools/python/python-cinderclient_1.0.3.bb b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
index 350c359..b9a353d 100644
--- a/meta-openstack/recipes-devtools/python/python-cinderclient_1.0.3.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
@@ -8,12 +8,11 @@ DEPENDS = "python-setuptools-git"
 PR = "r0"
 SRCNAME = "python-cinderclient"
 
-SRC_URI = "http://pypi.python.org/packages/source/p/python-cinderclient/python-cinderclient-1.0.3.tar.gz"
+SRC_URI = "git://github.com/openstack/python-cinderclient.git;branch=master"
 
-SRC_URI[md5sum] = "3bf0b62be5fb293108899e49d709694c"
-SRC_URI[sha256sum] = "6cc03f68a93a014d8ece1ed3bc7c37a6de79d08e29abfd97f185a5f412c7ce1a"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
+PV="git${SRCPV}"
+SRCREV="bdd560b3c02ea0a013ed4b7e7641c6240f3b602f"
+S = "${WORKDIR}/git"
 
 inherit setuptools