summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2020-04-24 09:09:40 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-04-26 14:00:51 +0100
commitc57eb0a488d19216f9ad3a5c1861f6b9bf4bc4b5 (patch)
treec4af812181553c0a57419924361a6412742a4b8b
parente5e0b30035ac4f8cc62a4c532a2ff46245ab84d0 (diff)
downloadpoky-c57eb0a488d19216f9ad3a5c1861f6b9bf4bc4b5.tar.gz
python3-pip: change shebang to python3
we have offcially dropped python2, so it is possible that our code run on python3 only host, so change shebang to python3 to avoid error like: python: command not found (From OE-Core rev: 4a4fabaa8f6915513a3b1ef2268c402e96eca888) Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch60
-rw-r--r--meta/recipes-devtools/python/python3-pip_20.0.2.bb2
2 files changed, 62 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch b/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch
new file mode 100644
index 0000000000..00cffe169b
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch
@@ -0,0 +1,60 @@
1From e7a00e9b5104ae2fbcea32a35c85760b77fae7e5 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Thu, 23 Apr 2020 09:42:10 +0000
4Subject: [PATCH] change shebang to python3
5
6Upstream-Status: Pending
7
8pip will drop support of python2 from 21.0
9
10Signed-off-by: Changqing Li <changqing.li@windriver.com>
11---
12 src/pip/_internal/__init__.py | 2 +-
13 src/pip/_vendor/appdirs.py | 2 +-
14 src/pip/_vendor/chardet/cli/chardetect.py | 2 +-
15 src/pip/_vendor/requests/certs.py | 2 +-
16 4 files changed, 4 insertions(+), 4 deletions(-)
17
18diff --git a/src/pip/_internal/__init__.py b/src/pip/_internal/__init__.py
19index 3aa8a46..e1ad179 100755
20--- a/src/pip/_internal/__init__.py
21+++ b/src/pip/_internal/__init__.py
22@@ -1,4 +1,4 @@
23-#!/usr/bin/env python
24+#!/usr/bin/env python3
25 import pip._internal.utils.inject_securetransport # noqa
26 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
27
28diff --git a/src/pip/_vendor/appdirs.py b/src/pip/_vendor/appdirs.py
29index 3a52b75..ad3f81d 100644
30--- a/src/pip/_vendor/appdirs.py
31+++ b/src/pip/_vendor/appdirs.py
32@@ -1,4 +1,4 @@
33-#!/usr/bin/env python
34+#!/usr/bin/env python3
35 # -*- coding: utf-8 -*-
36 # Copyright (c) 2005-2010 ActiveState Software Inc.
37 # Copyright (c) 2013 Eddy Petrișor
38diff --git a/src/pip/_vendor/chardet/cli/chardetect.py b/src/pip/_vendor/chardet/cli/chardetect.py
39index c61136b..a497e98 100644
40--- a/src/pip/_vendor/chardet/cli/chardetect.py
41+++ b/src/pip/_vendor/chardet/cli/chardetect.py
42@@ -1,4 +1,4 @@
43-#!/usr/bin/env python
44+#!/usr/bin/env python3
45 """
46 Script which takes one or more file paths and reports on their detected
47 encodings
48diff --git a/src/pip/_vendor/requests/certs.py b/src/pip/_vendor/requests/certs.py
49index 06a594e..bfa7839 100644
50--- a/src/pip/_vendor/requests/certs.py
51+++ b/src/pip/_vendor/requests/certs.py
52@@ -1,4 +1,4 @@
53-#!/usr/bin/env python
54+#!/usr/bin/env python3
55 # -*- coding: utf-8 -*-
56
57 """
58--
592.24.1
60
diff --git a/meta/recipes-devtools/python/python3-pip_20.0.2.bb b/meta/recipes-devtools/python/python3-pip_20.0.2.bb
index 08738fb2f9..96973db774 100644
--- a/meta/recipes-devtools/python/python3-pip_20.0.2.bb
+++ b/meta/recipes-devtools/python/python3-pip_20.0.2.bb
@@ -6,6 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8ba06d529c955048e5ddd7c45459eb2e"
6 6
7DEPENDS += "python3 python3-setuptools-native" 7DEPENDS += "python3 python3-setuptools-native"
8 8
9SRC_URI += "file://0001-change-shebang-to-python3.patch"
10
9SRC_URI[md5sum] = "7d42ba49b809604f0df3d55df1c3fd86" 11SRC_URI[md5sum] = "7d42ba49b809604f0df3d55df1c3fd86"
10SRC_URI[sha256sum] = "7db0c8ea4c7ea51c8049640e8e6e7fde949de672bfa4949920675563a5a6967f" 12SRC_URI[sha256sum] = "7db0c8ea4c7ea51c8049640e8e6e7fde949de672bfa4949920675563a5a6967f"
11 13