From 0e106ae4ced8f51ae4e0acb829a245b9ee02b8ac Mon Sep 17 00:00:00 2001 From: zangrc Date: Sat, 30 May 2020 01:11:22 +0800 Subject: python3-setuptools:upgrade 45.2.0 -> 47.1.1 Signed-off-by: Zang Ruochen Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python-setuptools.inc | 4 ++-- .../python3-setuptools/0001-change-shebang-to-python3.patch | 13 +------------ meta/recipes-devtools/python/python3-setuptools_45.2.0.bb | 6 ------ meta/recipes-devtools/python/python3-setuptools_47.1.1.bb | 6 ++++++ 4 files changed, 9 insertions(+), 20 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-setuptools_45.2.0.bb create mode 100644 meta/recipes-devtools/python/python3-setuptools_47.1.1.bb (limited to 'meta/recipes-devtools/python') diff --git a/meta/recipes-devtools/python/python-setuptools.inc b/meta/recipes-devtools/python/python-setuptools.inc index e9ad93dbee..c91cca9f06 100644 --- a/meta/recipes-devtools/python/python-setuptools.inc +++ b/meta/recipes-devtools/python/python-setuptools.inc @@ -12,8 +12,8 @@ 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] = "0c956eea142af9c2b02d72e3c042af30" -SRC_URI[sha256sum] = "89c6e6011ec2f6d57d43a3f9296c4ef022c2cbf49bab26b407fe67992ae3397f" +SRC_URI[md5sum] = "6e9de90b242fdd60ef59f497424ce13a" +SRC_URI[sha256sum] = "145fa62b9d7bb544fce16e9b5a9bf4ab2032d2f758b7cd674af09a92736aff74" DEPENDS += "${PYTHON_PN}" diff --git a/meta/recipes-devtools/python/python3-setuptools/0001-change-shebang-to-python3.patch b/meta/recipes-devtools/python/python3-setuptools/0001-change-shebang-to-python3.patch index 33af8daed7..6dcf52771b 100644 --- a/meta/recipes-devtools/python/python3-setuptools/0001-change-shebang-to-python3.patch +++ b/meta/recipes-devtools/python/python3-setuptools/0001-change-shebang-to-python3.patch @@ -8,8 +8,7 @@ Upstream-Status: Pending Signed-off-by: Changqing Li --- pkg_resources/_vendor/appdirs.py | 2 +- - setuptools/command/easy_install.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pkg_resources/_vendor/appdirs.py b/pkg_resources/_vendor/appdirs.py index ae67001..933e398 100644 @@ -21,16 +20,6 @@ index ae67001..933e398 100644 # -*- coding: utf-8 -*- # Copyright (c) 2005-2010 ActiveState Software Inc. # Copyright (c) 2013 Eddy Petrișor -diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py -index abca1ae..6bcdc98 100644 ---- a/setuptools/command/easy_install.py -+++ b/setuptools/command/easy_install.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """ - Easy Install - ------------ -- 2.24.1 diff --git a/meta/recipes-devtools/python/python3-setuptools_45.2.0.bb b/meta/recipes-devtools/python/python3-setuptools_45.2.0.bb deleted file mode 100644 index 0dc1ed8622..0000000000 --- a/meta/recipes-devtools/python/python3-setuptools_45.2.0.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.1.1.bb b/meta/recipes-devtools/python/python3-setuptools_47.1.1.bb new file mode 100644 index 0000000000..0dc1ed8622 --- /dev/null +++ b/meta/recipes-devtools/python/python3-setuptools_47.1.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