diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-24 16:12:39 +0000 |
---|---|---|
committer | Scott Garman <scott.a.garman@intel.com> | 2012-09-24 09:51:09 -0700 |
commit | f60a04ccbf9ed614b5b5b9b02c8a24980bf17d3d (patch) | |
tree | 9c1190c898dc996e41c1fd9bee36da09606c0e8e | |
parent | 0fd7b7dd361e59c687366480cd9f89c81c2e5bce (diff) | |
download | openembedded-core-f60a04ccbf9ed614b5b5b9b02c8a24980bf17d3d.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)
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() { STAGING_LIBDIR=${STAGING_LIBDIR} \ PYTHONPATH=${D}/${PYTHON_SITEPACKAGES_DIR} \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - ${STAGING_BINDIR_NATIVE}/python setup.py install --install-lib=${D}${libdir}/${PYTHON_DIR} ${DISTUTILS_INSTALL_ARGS}|| \ + ${STAGING_BINDIR_NATIVE}/python setup.py install --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS} || \ bbfatal "python setup.py install execution failed." 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" DISTUTILS_INSTALL_ARGS = "--root=${D} \ --single-version-externally-managed \ --prefix=${prefix} \ + --install-lib=${PYTHON_SITEPACKAGES_DIR} \ --install-data=${datadir}" |