python3-simplegeneric: 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, 12 insertions, 14 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-simplegeneric.inc b/meta-openstack/recipes-devtools/python/python-simplegeneric.inc
deleted file mode 100644
index 2cd9fc0..0000000
--- a/meta-openstack/recipes-devtools/python/python-simplegeneric.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "Simple generic functions"
-HOMEPAGE = "https://pypi.python.org/pypi/simplegeneric/"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://README.txt;md5=2085f2c228ed80422edf70e52e86c34b"
-
-PYPI_PACKAGE_EXT = "zip"
-
-SRC_URI[md5sum] = "f9c1fab00fd981be588fc32759f474e3"
-SRC_URI[sha256sum] = "dc972e06094b9af5b855b3df4a646395e43d1c9d0d39ed345b7393560d0b9173"
-
-inherit pypi
diff --git a/meta-openstack/recipes-devtools/python/python3-simplegeneric_0.8.1.bb b/meta-openstack/recipes-devtools/python/python3-simplegeneric_0.8.1.bb
index 56ad221..a960926 100644
--- a/meta-openstack/recipes-devtools/python/python3-simplegeneric_0.8.1.bb
+++ b/meta-openstack/recipes-devtools/python/python3-simplegeneric_0.8.1.bb
@@ -1,2 +1,12 @@
-inherit setuptools3
-require python-simplegeneric.inc 
+DESCRIPTION = "Simple generic functions"
+HOMEPAGE = "https://pypi.python.org/pypi/simplegeneric/"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://README.txt;md5=2085f2c228ed80422edf70e52e86c34b"
+
+PYPI_PACKAGE_EXT = "zip"
+
+SRC_URI[md5sum] = "f9c1fab00fd981be588fc32759f474e3"
+SRC_URI[sha256sum] = "dc972e06094b9af5b855b3df4a646395e43d1c9d0d39ed345b7393560d0b9173"
+
+inherit setuptools3 pypi