[oe-commits] Richard Purdie : distutils/steuptools: Fix files layout and unbreak builds
git at git.openembedded.org
git at git.openembedded.org
Fri Aug 24 16:30:44 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: bed18d5df7915e4127a538be9c7550e185c8c850
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=bed18d5df7915e4127a538be9c7550e185c8c850
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Fri Aug 24 16:12:39 2012 +0000
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 at linuxfoundation.org>
---
meta/classes/distutils.bbclass | 2 +-
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 52a1aa8..c73b24f 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 ced9509..ba9cf13 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}"
More information about the Openembedded-commits
mailing list