[oe-commits] Koen Kooi : distutils bbclass: delete site.py*
git at git.openembedded.org
git at git.openembedded.org
Sun Dec 15 16:44:58 UTC 2013
Module: openembedded-core.git
Branch: master-next
Commit: e53192d98ff8cdc4abe85b42e792da2759b22f84
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e53192d98ff8cdc4abe85b42e792da2759b22f84
Author: Koen Kooi <koen at dominion.thruhere.net>
Date: Wed Dec 11 09:50:07 2013 +0100
distutils bbclass: delete site.py*
Multiple recipes package this generated file and will clash during installation with:
| Collected errors:
| * check_data_file_clashes: Package python-nose wants to install file /build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/work/beaglebone-angstrom-linux-gnueabi/cloud9-gnome-image/1.0-r0/rootfs/usr/lib/python2.7/site-packages/site.pyc
| But that file is already provided by package * python-setuptools
| * check_data_file_clashes: Package python-nose wants to install file /build/v2013.06/build/tmp-angstrom_v2013_06-eglibc/work/beaglebone-angstrom-linux-gnueabi/cloud9-gnome-image/1.0-r0/rootfs/usr/lib/python2.7/site-packages/site.py
| But that file is already provided by package * python-setuptools
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
meta/classes/distutils.bbclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
index 8c3a979..80f6df8 100644
--- a/meta/classes/distutils.bbclass
+++ b/meta/classes/distutils.bbclass
@@ -64,6 +64,7 @@ distutils_do_install() {
fi
rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/easy-install.pth
+ rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py*
#
# FIXME: Bandaid against wrong datadir computation
More information about the Openembedded-commits
mailing list