3 files changed, 16 insertions, 20 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-setuptools-git.inc b/meta-openstack/recipes-devtools/python/python-setuptools-git.inc
deleted file mode 100644
index 18bc1dc..0000000
--- a/meta-openstack/recipes-devtools/python/python-setuptools-git.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Plugin for setuptools that enables git integration"
-HOMEPAGE = "https://github.com/wichert/setuptools-git"
-SECTION = "devel/python"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3775480a712fc46a69647678acb234cb"
-
-SRC_URI[md5sum] = "40b2ef7687a384ea144503c2e5bc67e2"
-SRC_URI[sha256sum] = "ff64136da01aabba76ae88b050e7197918d8b2139ccbf6144e14d472b9c40445"
-
-inherit pypi
-
-# conflicting file prevention
-do_install_append() {
-        rm -f ${D}${libdir}/python*/site-packages/site.py*
-}
-BBCLASSEXTEND = "native"
diff --git a/meta-openstack/recipes-devtools/python/python-setuptools-git_1.2.bb b/meta-openstack/recipes-devtools/python/python-setuptools-git_1.2.bb
deleted file mode 100644
index 5dd6804..0000000
--- a/meta-openstack/recipes-devtools/python/python-setuptools-git_1.2.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-inherit setuptools3
-require python-setuptools-git.inc
diff --git a/meta-openstack/recipes-devtools/python/python3-setuptools-git_1.2.bb b/meta-openstack/recipes-devtools/python/python3-setuptools-git_1.2.bb
index 5dd6804..34b40de 100644
--- a/meta-openstack/recipes-devtools/python/python3-setuptools-git_1.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-setuptools-git_1.2.bb
@@ -1,2 +1,16 @@
-inherit setuptools3
-require python-setuptools-git.inc
+DESCRIPTION = "Plugin for setuptools that enables git integration"
+HOMEPAGE = "https://github.com/wichert/setuptools-git"
+SECTION = "devel/python"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3775480a712fc46a69647678acb234cb"
+
+SRC_URI[md5sum] = "40b2ef7687a384ea144503c2e5bc67e2"
+SRC_URI[sha256sum] = "ff64136da01aabba76ae88b050e7197918d8b2139ccbf6144e14d472b9c40445"
+
+inherit setuptools3 pypi
+
+# conflicting file prevention
+do_install_append() {
+        rm -f ${D}${libdir}/python*/site-packages/site.py*
+}
+BBCLASSEXTEND = "native"