diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-24 16:12:39 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-28 16:53:06 +0100 |
commit | bf9a5226fce35a74c491ecaf6b56e3eb9ef1f843 (patch) | |
tree | aa3b048622d50214a82c871ff96a348452dfb8f5 | |
parent | d72eea5a5d3d6bf15251471929c984eb6e864df8 (diff) | |
download | poky-bf9a5226fce35a74c491ecaf6b56e3eb9ef1f843.tar.gz |
distutils/steuptools: Fix files layout and unbreak builds
The last two distutils changes progressivly broke the builds. Firstly they
moved things from the site_packages directory to being higher up the tree
which introduced package QA warnings as a side effect. Secondly, it interacts
badly with setuptools which passes in --root=${D} itself.
This patch restores the original directory layout, hence fixing the QA
warnings and also passes extra options to setuptools to deal with the
--root option it passes.
(From OE-Core rev: bed18d5df7915e4127a538be9c7550e185c8c850)
(From OE-Core rev: f60a04ccbf9ed614b5b5b9b02c8a24980bf17d3d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/distutils.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/setuptools.bbclass | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass index ec471babd7..1f097a8c4b 100644 --- a/meta/classes/distutils.bbclass +++ b/meta/classes/distutils.bbclass | |||
@@ -38,7 +38,7 @@ distutils_do_install() { | |||
38 | STAGING_LIBDIR=${STAGING_LIBDIR} \ | 38 | STAGING_LIBDIR=${STAGING_LIBDIR} \ |
39 | PYTHONPATH=${D}/${PYTHON_SITEPACKAGES_DIR} \ | 39 | PYTHONPATH=${D}/${PYTHON_SITEPACKAGES_DIR} \ |
40 | BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ | 40 | BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ |
41 | ${STAGING_BINDIR_NATIVE}/python setup.py install --install-lib=${D}${libdir}/${PYTHON_DIR} ${DISTUTILS_INSTALL_ARGS}|| \ | 41 | ${STAGING_BINDIR_NATIVE}/python setup.py install --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS} || \ |
42 | bbfatal "python setup.py install execution failed." | 42 | bbfatal "python setup.py install execution failed." |
43 | 43 | ||
44 | for i in `find ${D} -name "*.py"` ; do \ | 44 | for i in `find ${D} -name "*.py"` ; do \ |
diff --git a/meta/classes/setuptools.bbclass b/meta/classes/setuptools.bbclass index ced9509df2..ba9cf13295 100644 --- a/meta/classes/setuptools.bbclass +++ b/meta/classes/setuptools.bbclass | |||
@@ -5,4 +5,5 @@ DEPENDS += "python-setuptools-native" | |||
5 | DISTUTILS_INSTALL_ARGS = "--root=${D} \ | 5 | DISTUTILS_INSTALL_ARGS = "--root=${D} \ |
6 | --single-version-externally-managed \ | 6 | --single-version-externally-managed \ |
7 | --prefix=${prefix} \ | 7 | --prefix=${prefix} \ |
8 | --install-lib=${PYTHON_SITEPACKAGES_DIR} \ | ||
8 | --install-data=${datadir}" | 9 | --install-data=${datadir}" |