From ad9b3e26141b0da6c3fac911a65d920cce71c536 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 29 Jan 2014 20:00:14 -0800 Subject: python-setuptools: Remove its provided by python-distribute Use python-distribute-native in packagegroup-toolset-native Also fixes warnings like WARNING: The recipe python-setuptools is trying to install files into a shared area when those files already exist. Those files and their manifest location are: /srv/ssd/sgw/builds/world/tmp/sysroots/qemux86-64/usr/lib/python2.7/site-packages/setuptools.pth Matched in manifest-qemux86-64-python-distribute /srv/ssd/sgw/builds/world/tmp/sysroots/qemux86-64/usr/lib/python2.7/site-packages/site.pyc Matched in manifest-qemux86-64-python-distribute /srv/ssd/sgw/builds/world/tmp/sysroots/qemux86-64/usr/lib/python2.7/site-packages/site.py Matched in manifest-qemux86-64-python-distribute Conflicts: meta/recipes-devtools/python/python-setuptools_1.4.bb (From OE-Core rev: ddb0c70a7d4d51a1f404c194a562325137222146) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-gnome/packagegroups/packagegroup-toolset-native.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-gnome') diff --git a/meta/recipes-gnome/packagegroups/packagegroup-toolset-native.bb b/meta/recipes-gnome/packagegroups/packagegroup-toolset-native.bb index 07d4f1d7a9..f08cf1dfff 100644 --- a/meta/recipes-gnome/packagegroups/packagegroup-toolset-native.bb +++ b/meta/recipes-gnome/packagegroups/packagegroup-toolset-native.bb @@ -185,7 +185,7 @@ DEPENDS = "\ python-pygobject-native \ python-pyrex-native \ python-scons-native \ - python-setuptools-native \ + python-distribute-native \ python-smartpm-native \ qemu-helper-native \ qemu-native \ -- cgit v1.2.3-54-g00ecf