distutils bbclass: delete site.py*
authorKoen Kooi <koen@dominion.thruhere.net>
Wed, 11 Dec 2013 08:50:07 +0000 (09:50 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 14 Dec 2013 09:11:15 +0000 (09:11 +0000)
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>
meta/classes/distutils.bbclass

index 8c3a979..80f6df8 100644 (file)
@@ -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