diff options
| author | Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | 2015-09-10 15:51:33 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-14 10:44:05 +0100 |
| commit | e607a89267949b3d5e199b139f752db6000eac25 (patch) | |
| tree | 7e895cfe9f94ab10713b723b309faa8e3b64da3b /meta/classes/distutils.bbclass | |
| parent | f64a18a1c0fb9f3cd1bde2dc4b55d721ae06ca1d (diff) | |
| download | openembedded-core-e607a89267949b3d5e199b139f752db6000eac25.tar.gz openembedded-core-e607a89267949b3d5e199b139f752db6000eac25.tar.bz2 openembedded-core-e607a89267949b3d5e199b139f752db6000eac25.zip | |
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@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes/distutils.bbclass')
| -rw-r--r-- | meta/classes/distutils.bbclass | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass index 2498685d66..cd06713882 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 |