summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAlejandro Hernandez <alejandro.hernandez@linux.intel.com>2016-01-21 16:46:06 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-24 09:40:25 +0000
commit6baafa1d44f8e63e22d9ed49e92fb7c4d1b25ab4 (patch)
tree58828c7b6742c4fca95940b048876130aadd0804 /meta/recipes-devtools
parentf0e500e8a0421fae4375f17a0e42af9c299f6672 (diff)
downloadpoky-6baafa1d44f8e63e22d9ed49e92fb7c4d1b25ab4.tar.gz
python-setuptools: Unify and upgrade python-setuptools and python3-setuptools to 19.4
(From OE-Core rev: 7a42b4c01a0e1fa335ba1c679369d455235ea6ee) Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/python/python-setuptools.inc21
-rw-r--r--meta/recipes-devtools/python/python-setuptools_19.2.bb55
-rw-r--r--meta/recipes-devtools/python/python-setuptools_19.4.bb37
-rw-r--r--meta/recipes-devtools/python/python3-setuptools_19.4.bb (renamed from meta/recipes-devtools/python/python3-setuptools_19.2.bb)23
4 files changed, 60 insertions, 76 deletions
diff --git a/meta/recipes-devtools/python/python-setuptools.inc b/meta/recipes-devtools/python/python-setuptools.inc
new file mode 100644
index 0000000000..0917e88ab6
--- /dev/null
+++ b/meta/recipes-devtools/python/python-setuptools.inc
@@ -0,0 +1,21 @@
1SUMMARY = "Download, build, install, upgrade, and uninstall Python packages"
2HOMEPAGE = "https://pypi.python.org/pypi/setuptools"
3SECTION = "devel/python"
4LICENSE = "PSF | ZPL-2.0"
5
6LIC_FILES_CHKSUM = "file://setup.py;beginline=78;endline=78;md5=8a314270dd7a8dbca741775415f1716e"
7
8SRCNAME = "setuptools"
9
10SRC_URI = "http://pypi.python.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
11
12SRC_URI[md5sum] = "c5a7d90c1e0acf8c4ec5c2bf31bc25b5"
13SRC_URI[sha256sum] = "214bf29933f47cf25e6faa569f710731728a07a19cae91ea64f826051f68a8cf"
14
15UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/setuptools"
16
17S = "${WORKDIR}/${SRCNAME}-${PV}"
18
19do_install_prepend() {
20 install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages
21}
diff --git a/meta/recipes-devtools/python/python-setuptools_19.2.bb b/meta/recipes-devtools/python/python-setuptools_19.2.bb
deleted file mode 100644
index 404d301021..0000000000
--- a/meta/recipes-devtools/python/python-setuptools_19.2.bb
+++ /dev/null
@@ -1,55 +0,0 @@
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] = "78353b1f80375ca5e088f4b4627ffe03"
18SRC_URI[sha256sum] = "f90ed8eb70b14b0594ba74e9de4ffca040c0ec8ee505cbf3570499467859f71a"
19UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/setuptools"
20
21S = "${WORKDIR}/${SRCNAME}-${PV}"
22
23
24DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${libdir}/${PYTHON_DIR}/site-packages"
25
26do_install_prepend() {
27 install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages
28}
29
30RDEPENDS_${PN} = "\
31 python-stringold \
32 python-email \
33 python-shell \
34 python-distutils \
35 python-compression \
36 python-pkgutil \
37 python-plistlib \
38 python-numbers \
39 python-html \
40 python-netserver \
41 python-ctypes \
42 python-subprocess \
43 python-unittest \
44"
45
46RDEPENDS_${PN}_class-native = "\
47 python-distutils \
48 python-compression \
49"
50
51RREPLACES_${PN} = "python-distribute"
52RPROVIDES_${PN} = "python-distribute"
53RCONFLICTS_${PN} = "python-distribute"
54
55BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-devtools/python/python-setuptools_19.4.bb b/meta/recipes-devtools/python/python-setuptools_19.4.bb
new file mode 100644
index 0000000000..86bbebf081
--- /dev/null
+++ b/meta/recipes-devtools/python/python-setuptools_19.4.bb
@@ -0,0 +1,37 @@
1require python-setuptools.inc
2
3PROVIDES = "python-distribute"
4
5DEPENDS += "python"
6DEPENDS_class-native += "python-native"
7
8inherit distutils
9
10DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${libdir}/${PYTHON_DIR}/site-packages"
11
12RDEPENDS_${PN} = "\
13 python-stringold \
14 python-email \
15 python-shell \
16 python-distutils \
17 python-compression \
18 python-pkgutil \
19 python-plistlib \
20 python-numbers \
21 python-html \
22 python-netserver \
23 python-ctypes \
24 python-subprocess \
25 python-unittest \
26"
27
28RDEPENDS_${PN}_class-native = "\
29 python-distutils \
30 python-compression \
31"
32
33RREPLACES_${PN} = "python-distribute"
34RPROVIDES_${PN} = "python-distribute"
35RCONFLICTS_${PN} = "python-distribute"
36
37BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-devtools/python/python3-setuptools_19.2.bb b/meta/recipes-devtools/python/python3-setuptools_19.4.bb
index bb5798229f..fb2931c3f2 100644
--- a/meta/recipes-devtools/python/python3-setuptools_19.2.bb
+++ b/meta/recipes-devtools/python/python3-setuptools_19.4.bb
@@ -1,32 +1,13 @@
1SUMMARY = "Download, build, install, upgrade, and uninstall Python packages" 1require python-setuptools.inc
2HOMEPAGE = "http://packages.python.org/setuptools"
3SECTION = "devel/python"
4LICENSE = "PSF"
5LIC_FILES_CHKSUM = "file://setup.py;beginline=78;endline=78;md5=8a314270dd7a8dbca741775415f1716e"
6 2
7SRCNAME = "setuptools"
8DEPENDS += "python3" 3DEPENDS += "python3"
9DEPENDS_class-native += "python3-native" 4DEPENDS_class-native += "python3-native"
10 5
11SRC_URI = " \
12 http://pypi.python.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
13"
14SRC_URI[md5sum] = "78353b1f80375ca5e088f4b4627ffe03"
15SRC_URI[sha256sum] = "f90ed8eb70b14b0594ba74e9de4ffca040c0ec8ee505cbf3570499467859f71a"
16UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/setuptools"
17
18S = "${WORKDIR}/${SRCNAME}-${PV}"
19
20inherit distutils3 6inherit distutils3
21 7
22DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${libdir}/${PYTHON_DIR}/site-packages" 8DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${libdir}/${PYTHON_DIR}/site-packages"
23 9
24do_install_prepend() { 10# The installer puts the wrong path in the setuptools.pth file. Correct it.
25 install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages
26}
27#
28# The installer puts the wrong path in the setuptools.pth file. Correct it.
29#
30do_install_append() { 11do_install_append() {
31 rm ${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth 12 rm ${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth
32 mv ${D}${bindir}/easy_install ${D}${bindir}/easy3_install 13 mv ${D}${bindir}/easy_install ${D}${bindir}/easy3_install