diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-24 16:12:39 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-24 17:25:04 +0100 |
| commit | bed18d5df7915e4127a538be9c7550e185c8c850 (patch) | |
| tree | e165bfac63a636bc797610fe5b12028d265bb9ff /meta | |
| parent | a6029573fba6badc077486f2e3eab8df46e455ad (diff) | |
| download | openembedded-core-bed18d5df7915e4127a538be9c7550e185c8c850.tar.gz openembedded-core-bed18d5df7915e4127a538be9c7550e185c8c850.tar.bz2 openembedded-core-bed18d5df7915e4127a538be9c7550e185c8c850.zip | |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -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 52a1aa8749..c73b24f273 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-native/python setup.py install --install-lib=${D}${libdir}/${PYTHON_DIR} ${DISTUTILS_INSTALL_ARGS} || \ + ${STAGING_BINDIR_NATIVE}/python-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}" |