From 8f23d7683e0be7fb77e2ca5a3a8b55fbc51117e7 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 26 Jun 2020 09:18:44 +0200 Subject: python3-setuptools: upgrade 47.1.1 -> 47.3.1 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../0001-conditionally-do-not-fetch-code-by-easy_install.patch | 6 +++--- meta/recipes-devtools/python/python-setuptools.inc | 3 +-- meta/recipes-devtools/python/python3-setuptools_47.1.1.bb | 6 ------ meta/recipes-devtools/python/python3-setuptools_47.3.1.bb | 6 ++++++ 4 files changed, 10 insertions(+), 11 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-setuptools_47.1.1.bb create mode 100644 meta/recipes-devtools/python/python3-setuptools_47.3.1.bb 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 5f99cd2512..201e3570d6 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 @@ -From a8f871c9ebc4fcb99d4163b226aabeef26567099 Mon Sep 17 00:00:00 2001 +From 234c3da52da09b28db5b2c4d33ebe9c800c461ac Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 17 Jul 2018 10:13:38 +0800 Subject: [PATCH] conditionally do not fetch code by easy_install @@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia 1 file changed, 5 insertions(+) diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py -index 426301d..55c8062 100644 +index 5a9576f..f5961cb 100644 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py -@@ -649,6 +649,11 @@ class easy_install(Command): +@@ -656,6 +656,11 @@ class easy_install(Command): os.path.exists(tmpdir) and rmtree(rmtree_safe(tmpdir)) def easy_install(self, spec, deps=False): diff --git a/meta/recipes-devtools/python/python-setuptools.inc b/meta/recipes-devtools/python/python-setuptools.inc index 9322ca9a05..ecf1205752 100644 --- a/meta/recipes-devtools/python/python-setuptools.inc +++ b/meta/recipes-devtools/python/python-setuptools.inc @@ -12,8 +12,7 @@ SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-e SRC_URI += "file://0001-change-shebang-to-python3.patch" -SRC_URI[md5sum] = "6e9de90b242fdd60ef59f497424ce13a" -SRC_URI[sha256sum] = "145fa62b9d7bb544fce16e9b5a9bf4ab2032d2f758b7cd674af09a92736aff74" +SRC_URI[sha256sum] = "843037738d1e34e8b326b5e061f474aca6ef9d7ece41329afbc8aac6195a3920" DEPENDS += "${PYTHON_PN}" diff --git a/meta/recipes-devtools/python/python3-setuptools_47.1.1.bb b/meta/recipes-devtools/python/python3-setuptools_47.1.1.bb deleted file mode 100644 index 0dc1ed8622..0000000000 --- a/meta/recipes-devtools/python/python3-setuptools_47.1.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require python-setuptools.inc -inherit setuptools3 - -do_install_append() { - mv ${D}${bindir}/easy_install ${D}${bindir}/easy3_install -} diff --git a/meta/recipes-devtools/python/python3-setuptools_47.3.1.bb b/meta/recipes-devtools/python/python3-setuptools_47.3.1.bb new file mode 100644 index 0000000000..0dc1ed8622 --- /dev/null +++ b/meta/recipes-devtools/python/python3-setuptools_47.3.1.bb @@ -0,0 +1,6 @@ +require python-setuptools.inc +inherit setuptools3 + +do_install_append() { + mv ${D}${bindir}/easy_install ${D}${bindir}/easy3_install +} -- cgit 1.2.3-korg