[rocko][PATCH 0/1] python[3]-setuptools: inherit setuptools

[rocko][PATCH 0/1] python[3]-setuptools: inherit setuptools

[Tim Orling]

The existing recipes for python[3]-setuptools were not packaging the
"pkg_resources" module, which bmap-tools RDEPENDS on (see YOCTO #12148).

This was addressed in master, but requires a slightly different approach
for rocko (as we do not want to upgrade versions on stable branches).

This applies on top of poky-contrib stable/rocko-next at the time of
this writing.

The following changes since commit 0baeb05511623c7e68e1341629efd27a80c5b042:

  binutils: Convert SRC_URI and SRCREV to weak defines (2018-01-03 19:54:56 -0800)

are available in the git repository at:

  git://push.yoctoproject.org/poky-contrib timo/rocko-12148

Tim Orling (1):
  python[3]-setuptools: inherit setuptools

 meta/recipes-devtools/python/python-setuptools_36.2.7.bb  | 4 +---
 meta/recipes-devtools/python/python3-setuptools_36.2.7.bb | 7 +------
 2 files changed, 2 insertions(+), 9 deletions(-)

-- 
2.13.6

[rocko][PATCH 1/1] python[3]-setuptools: inherit setuptools

[Tim Orling]

* distutils[3].bbclass was not including pkg_resources module
* Drop uneeded DISTUTILS_INSTALL_ARGS as setuptools[3].bbclass provides it

Fixes [YOCTO #12148]

Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
---
 meta/recipes-devtools/python/python-setuptools_36.2.7.bb  | 4 +---
 meta/recipes-devtools/python/python3-setuptools_36.2.7.bb | 7 +------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-devtools/python/python-setuptools_36.2.7.bb b/meta/recipes-devtools/python/python-setuptools_36.2.7.bb
index 526474c7ea5..0efacc137af 100644
--- a/meta/recipes-devtools/python/python-setuptools_36.2.7.bb
+++ b/meta/recipes-devtools/python/python-setuptools_36.2.7.bb
@@ -5,9 +5,7 @@ PROVIDES = "python-distribute"
 DEPENDS += "python"
 DEPENDS_class-native += "python-native"
 
-inherit distutils
-
-DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${PYTHON_SITEPACKAGES_DIR}"
+inherit setuptools
 
 RDEPENDS_${PN} = "\
   python-stringold \
diff --git a/meta/recipes-devtools/python/python3-setuptools_36.2.7.bb b/meta/recipes-devtools/python/python3-setuptools_36.2.7.bb
index 63f241809e0..a7bca974026 100644
--- a/meta/recipes-devtools/python/python3-setuptools_36.2.7.bb
+++ b/meta/recipes-devtools/python/python3-setuptools_36.2.7.bb
@@ -4,15 +4,10 @@ DEPENDS += "python3"
 DEPENDS_class-native += "python3-native"
 DEPENDS_class-nativesdk += "nativesdk-python3"
 
-inherit distutils3
+inherit setuptools3
 
-DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${PYTHON_SITEPACKAGES_DIR}"
-
-# The installer puts the wrong path in the setuptools.pth file.  Correct it.
 do_install_append() {
-    rm ${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth
     mv ${D}${bindir}/easy_install ${D}${bindir}/easy3_install
-    echo "./${SRCNAME}-${PV}-py${PYTHON_BASEVERSION}.egg" > ${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth
 }
 
 RDEPENDS_${PN}_class-native = "\
-- 
2.13.6