python3-happybase: 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, 18 insertions, 20 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-happybase.inc b/meta-openstack/recipes-devtools/python/python-happybase.inc
deleted file mode 100644
index 325b2d1..0000000
--- a/meta-openstack/recipes-devtools/python/python-happybase.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Python library to interact with Apache HBase"
-HOMEPAGE = "https://pypi.python.org/pypi/happybase/"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=41f55ae3d7000e4323e84c468d8b42ee"
-
-SRC_URI[md5sum] = "96cb7ea8163f531907fabd0dddc8b87e"
-SRC_URI[sha256sum] = "850b4ee651128588a57e1e152dd1252e5ec39776a5d3d14ee892b8bac0fa9e1a"
-
-inherit pypi
-
-do_install_append() {
-        perm_files=$(find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "top_level.txt")
-        perm_files="$perm_files "$(find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "PKG-INFO")
-        for f in $perm_files; do
-                chmod 644 "${f}"
-        done
-}
diff --git a/meta-openstack/recipes-devtools/python/python3-happybase_1.2.0.bb b/meta-openstack/recipes-devtools/python/python3-happybase_1.2.0.bb
index 8b5571b..56b6c79 100644
--- a/meta-openstack/recipes-devtools/python/python3-happybase_1.2.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-happybase_1.2.0.bb
@@ -1,2 +1,18 @@
-inherit setuptools3
-require python-happybase.inc
+DESCRIPTION = "Python library to interact with Apache HBase"
+HOMEPAGE = "https://pypi.python.org/pypi/happybase/"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=41f55ae3d7000e4323e84c468d8b42ee"
+
+SRC_URI[md5sum] = "96cb7ea8163f531907fabd0dddc8b87e"
+SRC_URI[sha256sum] = "850b4ee651128588a57e1e152dd1252e5ec39776a5d3d14ee892b8bac0fa9e1a"
+
+inherit setuptools3 pypi
+
+do_install_append() {
+        perm_files=$(find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "top_level.txt")
+        perm_files="$perm_files "$(find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "PKG-INFO")
+        for f in $perm_files; do
+                chmod 644 "${f}"
+        done
+}