diff options
author | Tim Orling <timothy.t.orling@linux.intel.com> | 2018-01-04 14:56:44 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-06 10:13:54 +0000 |
commit | 64390f742bea1137ef56a55dbea81e99adf35b64 (patch) | |
tree | eb0fadde21208f79dbd47efc0b4025f69b6511a7 /meta/recipes-devtools/python | |
parent | 30cacd568c7019dfd408778c995fc4906251f947 (diff) | |
download | poky-64390f742bea1137ef56a55dbea81e99adf35b64.tar.gz |
python[3]-setuptools: inherit setuptools
* distutils[3].bbclass was not including pkg_resources module
* Drop uneeded DISTUTILS_INSTALL_ARGS as setuptools[3].bbclass provides it
Fixes [YOCTO #12148]
(From OE-Core rev: 4e09525c73348c2b47b07654ac31ffc6cbd3d5fe)
Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python')
-rw-r--r-- | meta/recipes-devtools/python/python-setuptools_36.2.7.bb | 4 | ||||
-rw-r--r-- | 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 526474c7ea..0efacc137a 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" | |||
5 | DEPENDS += "python" | 5 | DEPENDS += "python" |
6 | DEPENDS_class-native += "python-native" | 6 | DEPENDS_class-native += "python-native" |
7 | 7 | ||
8 | inherit distutils | 8 | inherit setuptools |
9 | |||
10 | DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${PYTHON_SITEPACKAGES_DIR}" | ||
11 | 9 | ||
12 | RDEPENDS_${PN} = "\ | 10 | RDEPENDS_${PN} = "\ |
13 | python-stringold \ | 11 | 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 63f241809e..a7bca97402 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" | |||
4 | DEPENDS_class-native += "python3-native" | 4 | DEPENDS_class-native += "python3-native" |
5 | DEPENDS_class-nativesdk += "nativesdk-python3" | 5 | DEPENDS_class-nativesdk += "nativesdk-python3" |
6 | 6 | ||
7 | inherit distutils3 | 7 | inherit setuptools3 |
8 | 8 | ||
9 | DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${PYTHON_SITEPACKAGES_DIR}" | ||
10 | |||
11 | # The installer puts the wrong path in the setuptools.pth file. Correct it. | ||
12 | do_install_append() { | 9 | do_install_append() { |
13 | rm ${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth | ||
14 | mv ${D}${bindir}/easy_install ${D}${bindir}/easy3_install | 10 | mv ${D}${bindir}/easy_install ${D}${bindir}/easy3_install |
15 | echo "./${SRCNAME}-${PV}-py${PYTHON_BASEVERSION}.egg" > ${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth | ||
16 | } | 11 | } |
17 | 12 | ||
18 | RDEPENDS_${PN}_class-native = "\ | 13 | RDEPENDS_${PN}_class-native = "\ |