python-oslo.utils: Python3 version fix

1) Remove 'inherit setuptools' from python-oslo.utils.inc as it was
included in python-oslo.utils_git.bb and python3-oslo.utils_git.bb.

2) Remove RDEPENDS which are not needed for python3.

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

2 files changed, 7 insertions, 4 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-oslo.utils.inc b/meta-openstack/recipes-devtools/python/python-oslo.utils.inc
index 04aa24a..8c3022d 100644
--- a/meta-openstack/recipes-devtools/python/python-oslo.utils.inc
+++ b/meta-openstack/recipes-devtools/python/python-oslo.utils.inc
@@ -11,8 +11,6 @@ PV = "3.28.0+git${SRCPV}"
 SRCREV = "8b3965b9bbe1e31a4939f2f69c5239d6d5c7f72c"
 S = "${WORKDIR}/git"
 
-inherit setuptools
-
 # DEPENDS_default: python-pip
 
 DEPENDS += " \
@@ -31,11 +29,9 @@ RDEPENDS_${PN} += " \
         ${PYTHON_PN}-six \
         ${PYTHON_PN}-iso8601 \
         ${PYTHON_PN}-oslo.i18n \
-        ${PYTHON_PN}-monotonic \
         ${PYTHON_PN}-pytz \
         ${PYTHON_PN}-netaddr \
         ${PYTHON_PN}-netifaces \
         ${PYTHON_PN}-debtcollector \
-        ${PYTHON_PN}-funcsigs \
         ${PYTHON_PN}-pyparsing \
         "
diff --git a/meta-openstack/recipes-devtools/python/python-oslo.utils_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.utils_git.bb
index fea3c85..1fe6253 100644
--- a/meta-openstack/recipes-devtools/python/python-oslo.utils_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-oslo.utils_git.bb
@@ -1,2 +1,9 @@
 inherit setuptools
 require python-oslo.utils.inc
+
+# RDEPENDS only for python2
+RDEPENDS_${PN} += " \
+        ${PYTHON_PN}-monotonic \
+        ${PYTHON_PN}-funcsigs \
+        "
+