diff options
author | Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> | 2020-07-25 11:54:23 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-07-27 10:37:57 +0100 |
commit | c1a56579ff9c435a49114b15f54c2f481f7d928a (patch) | |
tree | 5951f0e002318752b41ac6ced45277ed85101a9c /meta/recipes-devtools | |
parent | 5008ee45e41ac99f7867e929124c77b539fe4fb9 (diff) | |
download | poky-c1a56579ff9c435a49114b15f54c2f481f7d928a.tar.gz |
python3-setuptools: update to 49.2.0
Rebased patch and got rid of the .inc file as Python 2 is not supported
anymore.
(From OE-Core rev: ff3d9a2966e6593be9ac048d930fc841c24eae7d)
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch | 16 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3-setuptools_47.3.1.bb | 6 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3-setuptools_49.2.0.bb (renamed from meta/recipes-devtools/python/python-setuptools.inc) | 9 |
3 files changed, 16 insertions, 15 deletions
diff --git a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch index 201e3570d6..86c9363d65 100644 --- a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch +++ b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 234c3da52da09b28db5b2c4d33ebe9c800c461ac Mon Sep 17 00:00:00 2001 | 1 | From 768e1f2f14c9f1b3f9bd0e017c3f6183b45616e8 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Tue, 17 Jul 2018 10:13:38 +0800 | 3 | Date: Tue, 17 Jul 2018 10:13:38 +0800 |
4 | Subject: [PATCH] conditionally do not fetch code by easy_install | 4 | Subject: [PATCH] conditionally do not fetch code by easy_install |
@@ -9,16 +9,15 @@ internet by easy_install. | |||
9 | Upstream-Status: Inappropriate [oe specific] | 9 | Upstream-Status: Inappropriate [oe specific] |
10 | 10 | ||
11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
12 | |||
13 | --- | 12 | --- |
14 | setuptools/command/easy_install.py | 5 +++++ | 13 | setuptools/command/easy_install.py | 5 +++++ |
15 | 1 file changed, 5 insertions(+) | 14 | 1 file changed, 5 insertions(+) |
16 | 15 | ||
17 | diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py | 16 | diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py |
18 | index 5a9576f..f5961cb 100644 | 17 | index bcbd4f58..6455afda 100644 |
19 | --- a/setuptools/command/easy_install.py | 18 | --- a/setuptools/command/easy_install.py |
20 | +++ b/setuptools/command/easy_install.py | 19 | +++ b/setuptools/command/easy_install.py |
21 | @@ -656,6 +656,11 @@ class easy_install(Command): | 20 | @@ -653,6 +653,11 @@ class easy_install(Command): |
22 | os.path.exists(tmpdir) and rmtree(rmtree_safe(tmpdir)) | 21 | os.path.exists(tmpdir) and rmtree(rmtree_safe(tmpdir)) |
23 | 22 | ||
24 | def easy_install(self, spec, deps=False): | 23 | def easy_install(self, spec, deps=False): |
@@ -27,6 +26,9 @@ index 5a9576f..f5961cb 100644 | |||
27 | + "Please add its native recipe to DEPENDS." % spec) | 26 | + "Please add its native recipe to DEPENDS." % spec) |
28 | + return None | 27 | + return None |
29 | + | 28 | + |
30 | if not self.editable: | 29 | with self._tmpdir() as tmpdir: |
31 | self.install_site_py() | 30 | if not isinstance(spec, Requirement): |
32 | 31 | if URL_SCHEME(spec): | |
32 | -- | ||
33 | 2.25.1 | ||
34 | |||
diff --git a/meta/recipes-devtools/python/python3-setuptools_47.3.1.bb b/meta/recipes-devtools/python/python3-setuptools_47.3.1.bb deleted file mode 100644 index 0dc1ed8622..0000000000 --- a/meta/recipes-devtools/python/python3-setuptools_47.3.1.bb +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | require python-setuptools.inc | ||
2 | inherit setuptools3 | ||
3 | |||
4 | do_install_append() { | ||
5 | mv ${D}${bindir}/easy_install ${D}${bindir}/easy3_install | ||
6 | } | ||
diff --git a/meta/recipes-devtools/python/python-setuptools.inc b/meta/recipes-devtools/python/python3-setuptools_49.2.0.bb index ecf1205752..41ba6ea159 100644 --- a/meta/recipes-devtools/python/python-setuptools.inc +++ b/meta/recipes-devtools/python/python3-setuptools_49.2.0.bb | |||
@@ -6,13 +6,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=19;md5=9a33897f1bca1160d7 | |||
6 | 6 | ||
7 | PYPI_PACKAGE_EXT = "zip" | 7 | PYPI_PACKAGE_EXT = "zip" |
8 | 8 | ||
9 | inherit pypi | 9 | inherit pypi setuptools3 |
10 | 10 | ||
11 | SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" | 11 | SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" |
12 | 12 | ||
13 | SRC_URI += "file://0001-change-shebang-to-python3.patch" | 13 | SRC_URI += "file://0001-change-shebang-to-python3.patch" |
14 | 14 | ||
15 | SRC_URI[sha256sum] = "843037738d1e34e8b326b5e061f474aca6ef9d7ece41329afbc8aac6195a3920" | 15 | SRC_URI[sha256sum] = "afe9e81fee0270d3f60d52608549cc8ec4c46dada8c95640c1a00160f577acf2" |
16 | 16 | ||
17 | DEPENDS += "${PYTHON_PN}" | 17 | DEPENDS += "${PYTHON_PN}" |
18 | 18 | ||
@@ -36,10 +36,15 @@ RDEPENDS_${PN} = "\ | |||
36 | ${PYTHON_PN}-unittest \ | 36 | ${PYTHON_PN}-unittest \ |
37 | ${PYTHON_PN}-xml \ | 37 | ${PYTHON_PN}-xml \ |
38 | " | 38 | " |
39 | |||
39 | do_install_prepend() { | 40 | do_install_prepend() { |
40 | install -d ${D}${PYTHON_SITEPACKAGES_DIR} | 41 | install -d ${D}${PYTHON_SITEPACKAGES_DIR} |
41 | } | 42 | } |
42 | 43 | ||
44 | do_install_append() { | ||
45 | mv ${D}${bindir}/easy_install ${D}${bindir}/easy3_install | ||
46 | } | ||
47 | |||
43 | BBCLASSEXTEND = "native nativesdk" | 48 | BBCLASSEXTEND = "native nativesdk" |
44 | 49 | ||
45 | # The pkg-resources module can be used by itself, without the package downloader | 50 | # The pkg-resources module can be used by itself, without the package downloader |