diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2013-12-11 09:50:07 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-14 09:11:15 +0000 |
commit | 1cc8a011c4fc32cb3ac6bc92bf938c1a85c658a1 (patch) | |
tree | a0a1f3c262846d610ff8ef9aec411cdbcad7cc7f | |
parent | 66a5f8d02ae619b5258c232e3904d8fa02fd669b (diff) | |
download | poky-1cc8a011c4fc32cb3ac6bc92bf938c1a85c658a1.tar.gz |
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
(From OE-Core rev: e53192d98ff8cdc4abe85b42e792da2759b22f84)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/distutils.bbclass | 1 |
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() { | |||
64 | fi | 64 | fi |
65 | 65 | ||
66 | rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/easy-install.pth | 66 | rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/easy-install.pth |
67 | rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py* | ||
67 | 68 | ||
68 | # | 69 | # |
69 | # FIXME: Bandaid against wrong datadir computation | 70 | # FIXME: Bandaid against wrong datadir computation |