Patchwork [1/3] distutils bbclass: delete site.py*

login
register
mail settings
Submitter Koen Kooi
Date Dec. 11, 2013, 8:50 a.m.
Message ID <1386751809-8853-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/63207/
State Accepted
Commit 1cc8a011c4fc32cb3ac6bc92bf938c1a85c658a1
Headers show

Comments

Koen Kooi - Dec. 11, 2013, 8:50 a.m.
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>
---
 meta/classes/distutils.bbclass | 1 +
 1 file changed, 1 insertion(+)

Patch

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