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

Submitted by Tim Orling on Jan. 4, 2018, 10:55 p.m. | Patch ID: 147064

Details

Message ID 56c24dd22e765a999ab918a1f98f09cfb62a235b.1515106194.git.timothy.t.orling@linux.intel.com
State Rejected, archived
Delegated to: Armin Kuster
Headers show

Commit Message

Tim Orling Jan. 4, 2018, 10:55 p.m.
* 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(-)

Patch hide | download patch | download mbox

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 = "\