[oe-commits] Alejandro Hernandez : distutils.bbclass: Handle python-backport modules
git at git.openembedded.org
git at git.openembedded.org
Mon Sep 14 19:46:56 UTC 2015
Module: openembedded-core.git
Branch: master
Commit: e607a89267949b3d5e199b139f752db6000eac25
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e607a89267949b3d5e199b139f752db6000eac25
Author: Alejandro Hernandez <alejandro.hernandez at linux.intel.com>
Date: Thu Sep 10 15:51:33 2015 +0000
distutils.bbclass: Handle python-backport modules
When installing backport modules they stumble upon each other, complaining with
the following error:
ERROR: The recipe python-backports-ssl is trying to install files into a shared
area when those files already exist.
This is the correct behavior since thats just the way they were designed, all backport
modules provide an __init__.py file (the same among all packages), and without it they
simply wouldnt work.
distutils handles FILES_${PN}* variables for python packages, but it uses wildcards
to include the required files, hence removing the __init__.py files from each backport
package during build time is impossible since it doenst actually contain that value,
this patch simply removes the __init__.py* files from the staging area if they already
exist on sysroot, this way, these are not included in FILES_${PN} anymore, fixing the
issue mentioned above.
[YOCTO #8207]
Signed-off-by: Alejandro Hernandez <alejandro.hernandez at linux.intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
meta/classes/distutils.bbclass | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
index 2498685..cd06713 100644
--- a/meta/classes/distutils.bbclass
+++ b/meta/classes/distutils.bbclass
@@ -73,6 +73,12 @@ distutils_do_install() {
mv -f ${D}${datadir}/share/* ${D}${datadir}/
rmdir ${D}${datadir}/share
fi
+
+ # Fix backport modules
+ if test -e ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/backports/__init__.py && test -e ${D}${PYTHON_SITEPACKAGES_DIR}/backports/__init__.py; then
+ rm ${D}${PYTHON_SITEPACKAGES_DIR}/backports/__init__.py;
+ rm ${D}${PYTHON_SITEPACKAGES_DIR}/backports/__init__.pyc;
+ fi
}
EXPORT_FUNCTIONS do_compile do_install
More information about the Openembedded-commits
mailing list