python3-ordereddict: 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, 21 insertions, 23 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-ordereddict.inc b/meta-openstack/recipes-devtools/python/python-ordereddict.inc
deleted file mode 100644
index fff4bf6..0000000
--- a/meta-openstack/recipes-devtools/python/python-ordereddict.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "A drop-in substitute for Py2.7's new collections.OrderedDict that works in Python 2.4-2.6."
-HOMEPAGE = "https://pypi.python.org/pypi/ordereddict"
-SECTION = "devel/python"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=7f0267460024072a9bbf135ee87a41b8"
-
-SRC_URI[md5sum] = "a0ed854ee442051b249bfad0f638bbec"
-SRC_URI[sha256sum] = "1c35b4ac206cef2d24816c89f89cf289dd3d38cf7c449bb3fab7bf6d43f01b1f"
-
-inherit pypi
-
-# DEPENDS_default: python-pip
-
-DEPENDS += " \
-        ${PYTHON_PN}-pip \
-        "
-
-# RDEPENDS_default: 
-RDEPENDS_${PN} += " \
-    ${PYTHON_PN}-pip \
-    "
diff --git a/meta-openstack/recipes-devtools/python/python3-ordereddict_1.1.bb b/meta-openstack/recipes-devtools/python/python3-ordereddict_1.1.bb
index 46c08d0..9fa676b 100644
--- a/meta-openstack/recipes-devtools/python/python3-ordereddict_1.1.bb
+++ b/meta-openstack/recipes-devtools/python/python3-ordereddict_1.1.bb
@@ -1,2 +1,21 @@
-require python-ordereddict.inc
-inherit setuptools3
+DESCRIPTION = "A drop-in substitute for Py2.7's new collections.OrderedDict that works in Python 2.4-2.6."
+HOMEPAGE = "https://pypi.python.org/pypi/ordereddict"
+SECTION = "devel/python"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7f0267460024072a9bbf135ee87a41b8"
+
+SRC_URI[md5sum] = "a0ed854ee442051b249bfad0f638bbec"
+SRC_URI[sha256sum] = "1c35b4ac206cef2d24816c89f89cf289dd3d38cf7c449bb3fab7bf6d43f01b1f"
+
+inherit setuptools3 pypi
+
+# DEPENDS_default: python-pip
+
+DEPENDS += " \
+        ${PYTHON_PN}-pip \
+        "
+
+# RDEPENDS_default: 
+RDEPENDS_${PN} += " \
+    ${PYTHON_PN}-pip \
+    "