From 01ac9544e0a645f80f0c3aea327bf3ee8d02fff9 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Thu, 31 Oct 2013 01:30:55 -0400
Subject: swift: uprev to havana release

Upreving the swift component to the havana release. At the same time,
we switch to building from git.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../recipes-devtools/python/python-swift_1.8.0.bb  | 51 ----------------------
 .../recipes-devtools/python/python-swift_git.bb    | 50 +++++++++++++++++++++
 .../python/python-swiftclient_1.4.0.bb             | 16 -------
 .../python/python-swiftclient_git.bb               | 17 ++++++++
 4 files changed, 67 insertions(+), 67 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-swift_1.8.0.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python-swift_git.bb
 delete mode 100644 meta-openstack/recipes-devtools/python/python-swiftclient_1.4.0.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python-swiftclient_git.bb

(limited to 'meta-openstack/recipes-devtools')

diff --git a/meta-openstack/recipes-devtools/python/python-swift_1.8.0.bb b/meta-openstack/recipes-devtools/python/python-swift_1.8.0.bb
deleted file mode 100644
index a73fcc8..0000000
--- a/meta-openstack/recipes-devtools/python/python-swift_1.8.0.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-DESCRIPTION = "Highly available, distributed, eventually consistent object/blob store."
-HOMEPAGE = "https://launchpad.net/swift"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-PR = "r0"
-SRCNAME = "swift"
-
-SRC_URI = "https://launchpad.net/${SRCNAME}/grizzly/${PV}/+download/${SRCNAME}-${PV}.tar.gz \
-"
-
-SRC_URI[md5sum] = "0d2479c3cbb124fa3a6b001d0d4d5a8b"
-SRC_URI[sha256sum] = "613185473e0c6f11c77bdc6b65efee195303268117afd9024fee82ebde6ed8a3"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
-
-do_install_append() {
-    SWIFT_CONF_DIR=${D}${sysconfdir}/swift
-
-    install -d ${SWIFT_CONF_DIR}
-
-    install -m 600 ${S}/etc/swift.conf-sample ${SWIFT_CONF_DIR}/swift.conf
-    install -m 600 ${S}/etc/proxy-server.conf-sample ${SWIFT_CONF_DIR}/proxy-server.conf
-    install -m 600 ${S}/etc/account-server.conf-sample ${SWIFT_CONF_DIR}/account-server.conf
-    install -m 600 ${S}/etc/container-server.conf-sample ${SWIFT_CONF_DIR}/container-server.conf
-    install -m 600 ${S}/etc/object-server.conf-sample ${SWIFT_CONF_DIR}/object-server.conf
-}
-
-PACKAGES += "${SRCNAME}"
-
-FILES_${PN} = "${libdir}/*\
-"
-
-FILES_${SRCNAME} = "${bindir}/* \
-    ${sysconfdir}/${SRCNAME}/* \
-"
-
-RDEPENDS_${PN} += " \
-    python-eventlet \
-    python-greenlet \
-    python-pastedeploy \
-    python-simplejson \
-    python-swiftclient \
-    python-netifaces \
-    python-xattr \
-    "
-
-RDEPENDS_${SRCNAME} = "${PN}"
\ No newline at end of file
diff --git a/meta-openstack/recipes-devtools/python/python-swift_git.bb b/meta-openstack/recipes-devtools/python/python-swift_git.bb
new file mode 100644
index 0000000..971c77c
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-swift_git.bb
@@ -0,0 +1,50 @@
+DESCRIPTION = "Highly available, distributed, eventually consistent object/blob store."
+HOMEPAGE = "https://launchpad.net/swift"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+PR = "r0"
+SRCNAME = "swift"
+
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \
+"
+
+SRCREV="9b521fe800ed3984169d37e9772674867745fede"
+PV="2013.2+git${SRCPV}"
+S = "${WORKDIR}/git"
+
+inherit setuptools
+
+do_install_append() {
+    SWIFT_CONF_DIR=${D}${sysconfdir}/swift
+
+    install -d ${SWIFT_CONF_DIR}
+
+    install -m 600 ${S}/etc/swift.conf-sample ${SWIFT_CONF_DIR}/swift.conf
+    install -m 600 ${S}/etc/proxy-server.conf-sample ${SWIFT_CONF_DIR}/proxy-server.conf
+    install -m 600 ${S}/etc/account-server.conf-sample ${SWIFT_CONF_DIR}/account-server.conf
+    install -m 600 ${S}/etc/container-server.conf-sample ${SWIFT_CONF_DIR}/container-server.conf
+    install -m 600 ${S}/etc/object-server.conf-sample ${SWIFT_CONF_DIR}/object-server.conf
+}
+
+PACKAGES += "${SRCNAME}"
+
+FILES_${PN} = "${libdir}/*\
+"
+
+FILES_${SRCNAME} = "${bindir}/* \
+    ${sysconfdir}/${SRCNAME}/* \
+"
+
+RDEPENDS_${PN} += " \
+    python-eventlet \
+    python-greenlet \
+    python-pastedeploy \
+    python-simplejson \
+    python-swiftclient \
+    python-netifaces \
+    python-xattr \
+    "
+
+RDEPENDS_${SRCNAME} = "${PN}"
\ No newline at end of file
diff --git a/meta-openstack/recipes-devtools/python/python-swiftclient_1.4.0.bb b/meta-openstack/recipes-devtools/python/python-swiftclient_1.4.0.bb
deleted file mode 100644
index 9063f73..0000000
--- a/meta-openstack/recipes-devtools/python/python-swiftclient_1.4.0.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Client library for OpenStack Object Storage API"
-HOMEPAGE = "https://github.com/openstack/python-swiftclient"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
-
-PR = "r0"
-
-SRC_URI = "https://pypi.python.org/packages/source/p/${PN}/${PN}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "3767442551361cffdbb3681e401cea52"
-SRC_URI[sha256sum] = "95367a1db761cd71ac480cd4733a1cc55ef2afc2d48613142b8b89eac50cccc8"
-
-inherit setuptools 
-
-RDEPENDS_${PN} += "python-simplejson"
\ No newline at end of file
diff --git a/meta-openstack/recipes-devtools/python/python-swiftclient_git.bb b/meta-openstack/recipes-devtools/python/python-swiftclient_git.bb
new file mode 100644
index 0000000..032d472
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-swiftclient_git.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Client library for OpenStack Object Storage API"
+HOMEPAGE = "https://github.com/openstack/python-swiftclient"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
+
+PR = "r0"
+
+SRC_URI = "git://github.com/openstack/python-swiftclient.git;branch=master"
+
+PV="git${SRCPV}"
+SRCREV="4b78b4d136f5e18544ba97db85f47c5201d3a761"
+S = "${WORKDIR}/git"
+
+inherit setuptools 
+
+RDEPENDS_${PN} += "python-simplejson"
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf