python3-avahi: 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, 31 insertions, 35 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-avahi.inc b/meta-openstack/recipes-devtools/python/python-avahi.inc
deleted file mode 100644
index c235959..0000000
--- a/meta-openstack/recipes-devtools/python/python-avahi.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-SUMMARY = "Python bindings for the avahi zeroconf client"
-HOMEPAGE = "https://github.com/lathiat/avahi"
-SECTION = "devel/python"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1"
-
-SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "22b5e705d3eabb31d26f2e1e7b074013"
-SRC_URI[sha256sum] = "d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454"
-
-S = "${WORKDIR}/avahi-${PV}"
-
-inherit python3native
-
-# we only need the python bindings
-do_install () {
-        install -d ${D}${PYTHON_SITEPACKAGES_DIR}/avahi
-
-        sed -i'' -e "s,@PYTHON\@,${bindir}/${PYTHON_PN},g" \
-                ${S}/avahi-python/avahi/__init__.py  \
-                ${S}/avahi-python/avahi-bookmarks.in
-
-        install -m 0775 ${S}/avahi-python/avahi/__init__.py \
-                ${D}${PYTHON_SITEPACKAGES_DIR}/avahi/__init__.py
-
-        install -m 0775 ${S}/avahi-python/avahi-bookmarks.in \
-                ${D}${PYTHON_SITEPACKAGES_DIR}/avahi/avahi-bookmarks
-}
-
-FILES_${PN} = "${PYTHON_SITEPACKAGES_DIR}/avahi"
diff --git a/meta-openstack/recipes-devtools/python/python3-avahi_0.6.32.bb b/meta-openstack/recipes-devtools/python/python3-avahi_0.6.32.bb
index 4b85cd5..b5d3e77 100644
--- a/meta-openstack/recipes-devtools/python/python3-avahi_0.6.32.bb
+++ b/meta-openstack/recipes-devtools/python/python3-avahi_0.6.32.bb
@@ -1,5 +1,33 @@
-require python-avahi.inc
+RDEPENDS_${PN} += "python3-core python3-dbus"
+SUMMARY = "Python bindings for the avahi zeroconf client"
+HOMEPAGE = "https://github.com/lathiat/avahi"
+SECTION = "devel/python"
 
-inherit python3-dir
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
-RDEPENDS_${PN} += "python3-core python3-dbus"
+SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "22b5e705d3eabb31d26f2e1e7b074013"
+SRC_URI[sha256sum] = "d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454"
+
+S = "${WORKDIR}/avahi-${PV}"
+
+inherit python3native python3-dir
+
+# we only need the python bindings
+do_install () {
+        install -d ${D}${PYTHON_SITEPACKAGES_DIR}/avahi
+
+        sed -i'' -e "s,@PYTHON\@,${bindir}/${PYTHON_PN},g" \
+                ${S}/avahi-python/avahi/__init__.py  \
+                ${S}/avahi-python/avahi-bookmarks.in
+
+        install -m 0775 ${S}/avahi-python/avahi/__init__.py \
+                ${D}${PYTHON_SITEPACKAGES_DIR}/avahi/__init__.py
+
+        install -m 0775 ${S}/avahi-python/avahi-bookmarks.in \
+                ${D}${PYTHON_SITEPACKAGES_DIR}/avahi/avahi-bookmarks
+}
+
+FILES_${PN} = "${PYTHON_SITEPACKAGES_DIR}/avahi"