diff options
author | zangrc <zangrc.fnst@cn.fujitsu.com> | 2020-05-30 01:11:22 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-04 13:27:29 +0100 |
commit | 2f63944eaa2b524276dc45f3f810d953548ae38a (patch) | |
tree | c6e8b19522facfa0661cdbacd76131f50dd918e8 | |
parent | 6561a6a0b1e6b3410a1d1da697362306416d1509 (diff) | |
download | poky-2f63944eaa2b524276dc45f3f810d953548ae38a.tar.gz |
python3-setuptools:upgrade 45.2.0 -> 47.1.1
(From OE-Core rev: 0e106ae4ced8f51ae4e0acb829a245b9ee02b8ac)
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/python/python-setuptools.inc | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3-setuptools/0001-change-shebang-to-python3.patch | 13 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3-setuptools_47.1.1.bb (renamed from meta/recipes-devtools/python/python3-setuptools_45.2.0.bb) | 0 |
3 files changed, 3 insertions, 14 deletions
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 | |||
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[md5sum] = "0c956eea142af9c2b02d72e3c042af30" | 15 | SRC_URI[md5sum] = "6e9de90b242fdd60ef59f497424ce13a" |
16 | SRC_URI[sha256sum] = "89c6e6011ec2f6d57d43a3f9296c4ef022c2cbf49bab26b407fe67992ae3397f" | 16 | SRC_URI[sha256sum] = "145fa62b9d7bb544fce16e9b5a9bf4ab2032d2f758b7cd674af09a92736aff74" |
17 | 17 | ||
18 | DEPENDS += "${PYTHON_PN}" | 18 | DEPENDS += "${PYTHON_PN}" |
19 | 19 | ||
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 | |||
8 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | 8 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
9 | --- | 9 | --- |
10 | pkg_resources/_vendor/appdirs.py | 2 +- | 10 | pkg_resources/_vendor/appdirs.py | 2 +- |
11 | setuptools/command/easy_install.py | 2 +- | 11 | 1 files changed, 1 insertions(+), 1 deletions(-) |
12 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
13 | 12 | ||
14 | diff --git a/pkg_resources/_vendor/appdirs.py b/pkg_resources/_vendor/appdirs.py | 13 | diff --git a/pkg_resources/_vendor/appdirs.py b/pkg_resources/_vendor/appdirs.py |
15 | index ae67001..933e398 100644 | 14 | index ae67001..933e398 100644 |
@@ -21,16 +20,6 @@ index ae67001..933e398 100644 | |||
21 | # -*- coding: utf-8 -*- | 20 | # -*- coding: utf-8 -*- |
22 | # Copyright (c) 2005-2010 ActiveState Software Inc. | 21 | # Copyright (c) 2005-2010 ActiveState Software Inc. |
23 | # Copyright (c) 2013 Eddy Petrișor | 22 | # Copyright (c) 2013 Eddy Petrișor |
24 | diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py | ||
25 | index abca1ae..6bcdc98 100644 | ||
26 | --- a/setuptools/command/easy_install.py | ||
27 | +++ b/setuptools/command/easy_install.py | ||
28 | @@ -1,4 +1,4 @@ | ||
29 | -#!/usr/bin/env python | ||
30 | +#!/usr/bin/env python3 | ||
31 | """ | ||
32 | Easy Install | ||
33 | ------------ | ||
34 | -- | 23 | -- |
35 | 2.24.1 | 24 | 2.24.1 |
36 | 25 | ||
diff --git a/meta/recipes-devtools/python/python3-setuptools_45.2.0.bb b/meta/recipes-devtools/python/python3-setuptools_47.1.1.bb index 0dc1ed8622..0dc1ed8622 100644 --- a/meta/recipes-devtools/python/python3-setuptools_45.2.0.bb +++ b/meta/recipes-devtools/python/python3-setuptools_47.1.1.bb | |||