python3-amqplib: 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, 16 insertions, 17 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-amqplib.inc b/meta-openstack/recipes-devtools/python/python-amqplib.inc
deleted file mode 100644
index d9f22cb..0000000
--- a/meta-openstack/recipes-devtools/python/python-amqplib.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Python client for the Advanced Message Queuing Procotol (AMQP)"
-HOMEPAGE = "http://code.google.com/p/py-amqplib/"
-SECTION = "devel/python"
-LICENSE = "LGPL-3.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1702a92c723f09e3fab3583b165a8d90"
-
-PR = "r1"
-SRCNAME = "amqplib"
-
-SRC_URI = "https://github.com/barryp/py-amqplib/archive/${PV}.tar.gz"
-
-SRC_URI[md5sum] = "ff405a7b57aa98cdf07d02bd8090fa29"
-SRC_URI[sha256sum] = "9461d73f75ca704e6b656738b5dad42a1948e61dfbc8233077d84d00f74c3936"
-
-S = "${WORKDIR}/py-amqplib-${PV}"
-
diff --git a/meta-openstack/recipes-devtools/python/python3-amqplib_1.0.2.bb b/meta-openstack/recipes-devtools/python/python3-amqplib_1.0.2.bb
index 7623d17..218d92b 100644
--- a/meta-openstack/recipes-devtools/python/python3-amqplib_1.0.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-amqplib_1.0.2.bb
@@ -1,2 +1,17 @@
+DESCRIPTION = "Python client for the Advanced Message Queuing Procotol (AMQP)"
+HOMEPAGE = "http://code.google.com/p/py-amqplib/"
+SECTION = "devel/python"
+LICENSE = "LGPL-3.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1702a92c723f09e3fab3583b165a8d90"
+
+PR = "r1"
+SRCNAME = "amqplib"
+
+SRC_URI = "https://github.com/barryp/py-amqplib/archive/${PV}.tar.gz"
+
+SRC_URI[md5sum] = "ff405a7b57aa98cdf07d02bd8090fa29"
+SRC_URI[sha256sum] = "9461d73f75ca704e6b656738b5dad42a1948e61dfbc8233077d84d00f74c3936"
+
+S = "${WORKDIR}/py-amqplib-${PV}"
+
 inherit setuptools3
-require python-amqplib.inc