summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2013-12-11 09:50:07 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-14 09:09:34 +0000
commite53192d98ff8cdc4abe85b42e792da2759b22f84 (patch)
treef92452f49f80904d1dbcbdb068d6bd7a350fb76c /meta
parentf2f8a2a05cbfff7e1d5d979ec1b9f4f371579fb9 (diff)
downloadopenembedded-core-e53192d98ff8cdc4abe85b42e792da2759b22f84.tar.gz
openembedded-core-e53192d98ff8cdc4abe85b42e792da2759b22f84.tar.bz2
openembedded-core-e53192d98ff8cdc4abe85b42e792da2759b22f84.zip
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@dominion.thruhere.net> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/distutils.bbclass1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
index 8c3a979322..80f6df8ed8 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