python3-cephclient: Consolidate in a single file

Consolidate inc and bb files into a single bb file.

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

2 files changed, 26 insertions, 28 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-cephclient.inc b/meta-openstack/recipes-devtools/python/python-cephclient.inc
deleted file mode 100644
index e8e0d0a..0000000
--- a/meta-openstack/recipes-devtools/python/python-cephclient.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "A client library in python for the Ceph REST API."
-HOMEPAGE = "https://github.com/dmsimard/python-cephclient"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314"
-
-PYPI_PACKAGE = "python-cephclient"
-PYPI_SRC_URI = "https://pypi.python.org/packages/source/p/${PYPI_PACKAGE}/${PYPI_PACKAGE}-v${PV}.tar.gz"
-
-SRC_URI[md5sum] = "e3746607f1af1573a241b4995c10c938"
-SRC_URI[sha256sum] = "9776b786da2aebdc0439ea2f809cc8923f52bc0cf610f77a9c1348466961134b"
-
-inherit pypi
-
-# DEPENDS_default: python-pip
-
-DEPENDS += " \
-        ${PYTHON_PN}-pip \
-        "
-
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
-        ${PYTHON_PN}-lxml \
-        ${PYTHON_PN}-requests \
-        ${PYTHON_PN}-cython \
-        "
diff --git a/meta-openstack/recipes-devtools/python/python3-cephclient_0.1.0.5.bb b/meta-openstack/recipes-devtools/python/python3-cephclient_0.1.0.5.bb
index e05c1d5..65e84bf 100644
--- a/meta-openstack/recipes-devtools/python/python3-cephclient_0.1.0.5.bb
+++ b/meta-openstack/recipes-devtools/python/python3-cephclient_0.1.0.5.bb
@@ -1,2 +1,26 @@
-require python-cephclient.inc
-inherit setuptools3
+DESCRIPTION = "A client library in python for the Ceph REST API."
+HOMEPAGE = "https://github.com/dmsimard/python-cephclient"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314"
+
+PYPI_PACKAGE = "python-cephclient"
+PYPI_SRC_URI = "https://pypi.python.org/packages/source/p/${PYPI_PACKAGE}/${PYPI_PACKAGE}-v${PV}.tar.gz"
+
+SRC_URI[md5sum] = "e3746607f1af1573a241b4995c10c938"
+SRC_URI[sha256sum] = "9776b786da2aebdc0439ea2f809cc8923f52bc0cf610f77a9c1348466961134b"
+
+inherit setuptools3 pypi
+
+# DEPENDS_default: python-pip
+
+DEPENDS += " \
+        ${PYTHON_PN}-pip \
+        "
+
+# RDEPENDS_default: 
+RDEPENDS_${PN} += " \
+        ${PYTHON_PN}-lxml \
+        ${PYTHON_PN}-requests \
+        ${PYTHON_PN}-cython \
+        "