diff options
author | Wang Mingyu <wangmy@fujitsu.com> | 2023-12-19 17:58:27 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-12-23 08:46:00 +0000 |
commit | a0105d85b42dd2fdd858f14ef04a916b737af79d (patch) | |
tree | 6532986abbba5c1e54abba82e8bb1d1ab952d003 | |
parent | 97d72a8d34092bb117a06298fe1cd175a3fd4c4a (diff) | |
download | poky-a0105d85b42dd2fdd858f14ef04a916b737af79d.tar.gz |
python3-pip: upgrade 23.3.1 -> 23.3.2
no_shebang_mangling.patch
refreshed for 23.3.2
Changelog:
==========
-Fix a bug in extras handling for link requirements
-Fix mercurial revision "parse error": use --rev={ref} instead of -r={ref}
(From OE-Core rev: 51bd305c023b64ae5f6972bb489916861d11477f)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/python/python3-pip/no_shebang_mangling.patch | 21 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3-pip_23.3.2.bb (renamed from meta/recipes-devtools/python/python3-pip_23.3.1.bb) | 2 |
2 files changed, 16 insertions, 7 deletions
diff --git a/meta/recipes-devtools/python/python3-pip/no_shebang_mangling.patch b/meta/recipes-devtools/python/python3-pip/no_shebang_mangling.patch index 920e22bc02..b59f4888da 100644 --- a/meta/recipes-devtools/python/python3-pip/no_shebang_mangling.patch +++ b/meta/recipes-devtools/python/python3-pip/no_shebang_mangling.patch | |||
@@ -1,14 +1,23 @@ | |||
1 | From 915bf32cd117cd86cc0d4b96bc9490b1c7119ffd Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Wed, 23 Feb 2022 12:27:06 +0000 | ||
4 | Subject: [PATCH] python3-pip: Don't change shebang | ||
5 | |||
1 | Patch pip to disable shebang mangling and also force the python executable | 6 | Patch pip to disable shebang mangling and also force the python executable |
2 | to be python3 from the environment when building anything for the target | 7 | to be python3 from the environment when building anything for the target |
3 | (or nativesdk). This avoids incorrect interpreter paths in the target scripts. | 8 | (or nativesdk). This avoids incorrect interpreter paths in the target scripts. |
4 | 9 | ||
5 | Upstream-Status: Inappropriate [OE specific config] | 10 | Upstream-Status: Inappropriate [OE specific config] |
6 | 11 | ||
7 | Index: pip-22.0.3/src/pip/_vendor/distlib/scripts.py | 12 | --- |
8 | =================================================================== | 13 | src/pip/_vendor/distlib/scripts.py | 4 +++- |
9 | --- pip-22.0.3.orig/src/pip/_vendor/distlib/scripts.py | 14 | 1 file changed, 3 insertions(+), 1 deletion(-) |
10 | +++ pip-22.0.3/src/pip/_vendor/distlib/scripts.py | 15 | |
11 | @@ -135,6 +135,8 @@ class ScriptMaker(object): | 16 | diff --git a/src/pip/_vendor/distlib/scripts.py b/src/pip/_vendor/distlib/scripts.py |
17 | index d270624..42c0d10 100644 | ||
18 | --- a/src/pip/_vendor/distlib/scripts.py | ||
19 | +++ b/src/pip/_vendor/distlib/scripts.py | ||
20 | @@ -137,6 +137,8 @@ class ScriptMaker(object): | ||
12 | See also: http://www.in-ulm.de/~mascheck/various/shebang/#length | 21 | See also: http://www.in-ulm.de/~mascheck/various/shebang/#length |
13 | https://hg.mozilla.org/mozilla-central/file/tip/mach | 22 | https://hg.mozilla.org/mozilla-central/file/tip/mach |
14 | """ | 23 | """ |
@@ -17,7 +26,7 @@ Index: pip-22.0.3/src/pip/_vendor/distlib/scripts.py | |||
17 | if os.name != 'posix': | 26 | if os.name != 'posix': |
18 | simple_shebang = True | 27 | simple_shebang = True |
19 | else: | 28 | else: |
20 | @@ -340,7 +342,7 @@ class ScriptMaker(object): | 29 | @@ -348,7 +350,7 @@ class ScriptMaker(object): |
21 | return | 30 | return |
22 | 31 | ||
23 | match = FIRST_LINE_RE.match(first_line.replace(b'\r\n', b'\n')) | 32 | match = FIRST_LINE_RE.match(first_line.replace(b'\r\n', b'\n')) |
diff --git a/meta/recipes-devtools/python/python3-pip_23.3.1.bb b/meta/recipes-devtools/python/python3-pip_23.3.2.bb index 38d6c4ad92..0f2ab9288b 100644 --- a/meta/recipes-devtools/python/python3-pip_23.3.1.bb +++ b/meta/recipes-devtools/python/python3-pip_23.3.2.bb | |||
@@ -33,7 +33,7 @@ inherit pypi python_setuptools_build_meta | |||
33 | 33 | ||
34 | SRC_URI += "file://no_shebang_mangling.patch" | 34 | SRC_URI += "file://no_shebang_mangling.patch" |
35 | 35 | ||
36 | SRC_URI[sha256sum] = "1fcaa041308d01f14575f6d0d2ea4b75a3e2871fe4f9c694976f908768e14174" | 36 | SRC_URI[sha256sum] = "7fd9972f96db22c8077a1ee2691b172c8089b17a5652a44494a9ecb0d78f9149" |
37 | 37 | ||
38 | do_install:append() { | 38 | do_install:append() { |
39 | rm -f ${D}/${bindir}/pip | 39 | rm -f ${D}/${bindir}/pip |