From 7eabed3039b28119bb6642205bf26460695cb22e Mon Sep 17 00:00:00 2001 From: Alejandro Hernandez Date: Thu, 10 Sep 2015 15:51:33 +0000 Subject: 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] (From OE-Core rev: e607a89267949b3d5e199b139f752db6000eac25) Signed-off-by: Alejandro Hernandez Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/distutils.bbclass | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'meta/classes/distutils.bbclass') 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 -- cgit v1.2.3-54-g00ecf