summaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--meta/recipes-devtools/python/python-distribute_0.6.32.bb6
-rw-r--r--meta/recipes-devtools/python/python-setuptools_1.4.bb40
-rw-r--r--meta/recipes-devtools/python/python3-distribute_0.6.32.bb6
-rw-r--r--meta/recipes-gnome/packagegroups/packagegroup-toolset-native.bb2
4 files changed, 9 insertions, 45 deletions
diff --git a/meta/recipes-devtools/python/python-distribute_0.6.32.bb b/meta/recipes-devtools/python/python-distribute_0.6.32.bb
index 86ac8718a9..ddc8d00bcf 100644
--- a/meta/recipes-devtools/python/python-distribute_0.6.32.bb
+++ b/meta/recipes-devtools/python/python-distribute_0.6.32.bb
@@ -12,6 +12,9 @@ DEPENDS_virtclass-native += "python-native"
12SRC_URI = " \ 12SRC_URI = " \
13 http://pypi.python.org/packages/source/d/distribute/${SRCNAME}-${PV}.tar.gz \ 13 http://pypi.python.org/packages/source/d/distribute/${SRCNAME}-${PV}.tar.gz \
14" 14"
15SRC_URI[md5sum] = "acb7a2da81e3612bfb1608abe4f0e568"
16SRC_URI[sha256sum] = "8970cd1e148b5d1fea9430584aea66c45ea22d80e0933393ec49ebc388f718df"
17
15S = "${WORKDIR}/${SRCNAME}-${PV}" 18S = "${WORKDIR}/${SRCNAME}-${PV}"
16 19
17# http://python-distribute.org/distribute_setup.py 20# http://python-distribute.org/distribute_setup.py
@@ -41,7 +44,6 @@ RDEPENDS_${PN} = "\
41 python-compression \ 44 python-compression \
42" 45"
43 46
44SRC_URI[md5sum] = "acb7a2da81e3612bfb1608abe4f0e568" 47RPROVIDES_${PN} += "python-setuptools"
45SRC_URI[sha256sum] = "8970cd1e148b5d1fea9430584aea66c45ea22d80e0933393ec49ebc388f718df"
46 48
47BBCLASSEXTEND = "native" 49BBCLASSEXTEND = "native"
diff --git a/meta/recipes-devtools/python/python-setuptools_1.4.bb b/meta/recipes-devtools/python/python-setuptools_1.4.bb
deleted file mode 100644
index 4138d288a8..0000000000
--- a/meta/recipes-devtools/python/python-setuptools_1.4.bb
+++ /dev/null
@@ -1,40 +0,0 @@
1SUMMARY = "Downloads, builds, installs, upgrades, and uninstalls Python packages"
2HOMEPAGE = "http://cheeseshop.python.org/pypi/setuptools"
3SECTION = "devel/python"
4LICENSE = "PSF"
5LIC_FILES_CHKSUM = "file://setup.py;beginline=107;endline=107;md5=8a314270dd7a8dbca741775415f1716e"
6
7SRCNAME = "setuptools"
8DEPENDS += "python"
9DEPENDS_class-native += "python-native"
10
11SRC_URI = "\
12 http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz\
13"
14S = "${WORKDIR}/${SRCNAME}-${PV}"
15
16inherit distutils
17
18DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${libdir}/${PYTHON_DIR}/site-packages"
19
20do_install_prepend() {
21 install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages
22}
23
24RDEPENDS_${PN} = "\
25 python-stringold \
26 python-email \
27 python-shell \
28 python-distutils \
29 python-compression \
30"
31
32RDEPENDS_${PN}_class-native = "\
33 python-distutils \
34 python-compression \
35"
36
37SRC_URI[md5sum] = "5710464bc5a61d75f5087f15ce63cfe0"
38SRC_URI[sha256sum] = "75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39"
39
40BBCLASSEXTEND = "native"
diff --git a/meta/recipes-devtools/python/python3-distribute_0.6.32.bb b/meta/recipes-devtools/python/python3-distribute_0.6.32.bb
index 31fc56dfbc..d4f00cd797 100644
--- a/meta/recipes-devtools/python/python3-distribute_0.6.32.bb
+++ b/meta/recipes-devtools/python/python3-distribute_0.6.32.bb
@@ -12,6 +12,9 @@ DEPENDS_virtclass-native += "python3-native"
12SRC_URI = " \ 12SRC_URI = " \
13 http://pypi.python.org/packages/source/d/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \ 13 http://pypi.python.org/packages/source/d/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
14" 14"
15SRC_URI[md5sum] = "acb7a2da81e3612bfb1608abe4f0e568"
16SRC_URI[sha256sum] = "8970cd1e148b5d1fea9430584aea66c45ea22d80e0933393ec49ebc388f718df"
17
15S = "${WORKDIR}/${SRCNAME}-${PV}" 18S = "${WORKDIR}/${SRCNAME}-${PV}"
16 19
17# http://python-distribute.org/distribute_setup.py 20# http://python-distribute.org/distribute_setup.py
@@ -41,7 +44,6 @@ RDEPENDS_${PN} = "\
41 python3-compression \ 44 python3-compression \
42" 45"
43 46
44SRC_URI[md5sum] = "acb7a2da81e3612bfb1608abe4f0e568" 47RPROVIDES_${PN} += "python3-setuptools"
45SRC_URI[sha256sum] = "8970cd1e148b5d1fea9430584aea66c45ea22d80e0933393ec49ebc388f718df"
46 48
47BBCLASSEXTEND = "native" 49BBCLASSEXTEND = "native"
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 \