summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2014-01-29 20:00:14 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-02 22:37:39 +0000
commitad9b3e26141b0da6c3fac911a65d920cce71c536 (patch)
tree677e8cde61ecddfd2845cdc375f2125c091bf30f /meta/recipes-gnome
parentaacfd003d5670e14ee862619fb5413befa66eea0 (diff)
downloadpoky-ad9b3e26141b0da6c3fac911a65d920cce71c536.tar.gz
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 <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/packagegroups/packagegroup-toolset-native.bb2
1 files changed, 1 insertions, 1 deletions
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 = "\
185 python-pygobject-native \ 185 python-pygobject-native \
186 python-pyrex-native \ 186 python-pyrex-native \
187 python-scons-native \ 187 python-scons-native \
188 python-setuptools-native \ 188 python-distribute-native \
189 python-smartpm-native \ 189 python-smartpm-native \
190 qemu-helper-native \ 190 qemu-helper-native \
191 qemu-native \ 191 qemu-native \