summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-08-26 01:40:56 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-30 12:36:07 +0100
commite79a22e4560cac0ce78a1ec04d7f799421e2b80f (patch)
tree7d52d68173cef3d734545e737bccb9acdf1710ae
parent48373be8303b620fbddda3298e4eb0c8d188f7dc (diff)
downloadpoky-e79a22e4560cac0ce78a1ec04d7f799421e2b80f.tar.gz
python-distribute, python-setuptools: Migrate to good old python-setuptools
setuptools the old king is ruling again, distribute fork has been merged into setuptools starting 0.7x, so lets move to use it as well Remove licence ambiguity we need to say which verison of PSF and Zope license is in use Fixes [YOCTO #8201] (From OE-Core rev: 58d9f06b2d467dcff781fecf4cbf03b0b7e25432) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python-distribute_0.6.32.bb63
-rw-r--r--meta/recipes-devtools/python/python-setuptools_18.2.bb46
-rw-r--r--meta/recipes-devtools/python/python3-setuptools_18.2.bb (renamed from meta/recipes-devtools/python/python3-setuptools_15.2.bb)4
3 files changed, 48 insertions, 65 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
deleted file mode 100644
index aa0763377d..0000000000
--- a/meta/recipes-devtools/python/python-distribute_0.6.32.bb
+++ /dev/null
@@ -1,63 +0,0 @@
1SUMMARY = "Download, build, install, upgrade, and uninstall Python packages"
2HOMEPAGE = "http://packages.python.org/distribute"
3SECTION = "devel/python"
4LICENSE = "PSF"
5LIC_FILES_CHKSUM = "file://setup.py;beginline=234;endline=234;md5=26f6b02022b737126d3c88838782dddb"
6
7SRCNAME = "distribute"
8PR = "ml5"
9DEPENDS += "python"
10DEPENDS_class-native += "python-native"
11
12SRC_URI = " \
13 http://pypi.python.org/packages/source/d/distribute/${SRCNAME}-${PV}.tar.gz \
14"
15SRC_URI[md5sum] = "acb7a2da81e3612bfb1608abe4f0e568"
16SRC_URI[sha256sum] = "8970cd1e148b5d1fea9430584aea66c45ea22d80e0933393ec49ebc388f718df"
17
18S = "${WORKDIR}/${SRCNAME}-${PV}"
19
20# http://python-distribute.org/distribute_setup.py
21
22# force the selection of python3
23#PYTHON_BASEVERSION = "3.3"
24#PYTHON_MAJMIN = "3.3"
25
26inherit distutils
27
28DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${libdir}/${PYTHON_DIR}/site-packages"
29
30do_install_prepend() {
31 install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages
32}
33
34#
35# The installer puts the wrong path in the setuptools.pth file. Correct it.
36#
37do_install_append() {
38 rm ${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth
39 echo "./${SRCNAME}-${PV}-py${PYTHON_BASEVERSION}.egg" > ${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth
40}
41
42do_install_append_class-nativesdk() {
43 sed -i -e '1s|^#!.*|#!/usr/bin/env python|' ${D}${PYTHON_SITEPACKAGES_DIR}/distribute-${PV}-py${PYTHON_BASEVERSION}.egg/setuptools/tests/test_resources.py
44 sed -i -e '1s|^#!.*|#!/usr/bin/env python|' ${D}${bindir}/easy_install
45 sed -i -e '1s|^#!.*|#!/usr/bin/env python|' ${D}${bindir}/easy_install-${PYTHON_BASEVERSION}
46}
47
48RDEPENDS_${PN} = "\
49 python-distutils \
50 python-compression \
51"
52
53RDEPENDS_${PN}_class-target = "\
54 python-distutils \
55 python-compression \
56 python-netclient \
57 python-email \
58 python-shell \
59"
60
61RPROVIDES_${PN} += "python-setuptools"
62
63BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-devtools/python/python-setuptools_18.2.bb b/meta/recipes-devtools/python/python-setuptools_18.2.bb
new file mode 100644
index 0000000000..1de2b2e927
--- /dev/null
+++ b/meta/recipes-devtools/python/python-setuptools_18.2.bb
@@ -0,0 +1,46 @@
1SUMMARY = "Downloads, builds, installs, upgrades, and uninstalls Python packages"
2HOMEPAGE = "https://pypi.python.org/pypi/setuptools"
3SECTION = "devel/python"
4LICENSE = "Python-2.0 | ZPL-2.0"
5LIC_FILES_CHKSUM = "file://setup.py;beginline=78;endline=78;md5=8a314270dd7a8dbca741775415f1716e"
6
7SRCNAME = "setuptools"
8
9PROVIDES = "python-distribute"
10
11DEPENDS += "python"
12DEPENDS_class-native += "python-native"
13
14inherit distutils
15
16SRC_URI = "https://pypi.python.org/packages/source/s/setuptools/setuptools-${PV}.tar.gz"
17SRC_URI[md5sum] = "52b4e48939ef311d7204f8fe940764f4"
18SRC_URI[sha256sum] = "0994a58df27ea5dc523782a601357a2198b7493dcc99a30d51827a23585b5b1d"
19
20S = "${WORKDIR}/${SRCNAME}-${PV}"
21
22
23DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${libdir}/${PYTHON_DIR}/site-packages"
24
25do_install_prepend() {
26 install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages
27}
28
29RDEPENDS_${PN} = "\
30 python-stringold \
31 python-email \
32 python-shell \
33 python-distutils \
34 python-compression \
35"
36
37RDEPENDS_${PN}_class-native = "\
38 python-distutils \
39 python-compression \
40"
41
42RREPLACES_${PN} = "python-distribute"
43RPROVIDES_${PN} = "python-distribute"
44RCONFLICTS_${PN} = "python-distribute"
45
46BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-devtools/python/python3-setuptools_15.2.bb b/meta/recipes-devtools/python/python3-setuptools_18.2.bb
index 97058c139c..dc0ac80d74 100644
--- a/meta/recipes-devtools/python/python3-setuptools_15.2.bb
+++ b/meta/recipes-devtools/python/python3-setuptools_18.2.bb
@@ -11,8 +11,8 @@ DEPENDS_class-native += "python3-native"
11SRC_URI = " \ 11SRC_URI = " \
12 http://pypi.python.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \ 12 http://pypi.python.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
13" 13"
14SRC_URI[md5sum] = "a9028a9794fc7ae02320d32e2d7e12ee" 14SRC_URI[md5sum] = "52b4e48939ef311d7204f8fe940764f4"
15SRC_URI[sha256sum] = "381e78471fb0eff89c4b1a219e8739f48dd87c76ad2d3a790010ca3a62ee29a4" 15SRC_URI[sha256sum] = "0994a58df27ea5dc523782a601357a2198b7493dcc99a30d51827a23585b5b1d"
16 16
17S = "${WORKDIR}/${SRCNAME}-${PV}" 17S = "${WORKDIR}/${SRCNAME}-${PV}"
18 18