diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-11-24 15:50:18 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-11-25 21:37:40 +0000 |
commit | a629b6ca5214496f2de29f1dff6a2612b5719fe6 (patch) | |
tree | 51cc1aa818bf048c577be5f43644ac1f590f1050 /meta/recipes-devtools/python/python-native | |
parent | e8e3b2ce49a19deac2ac15d509ed4e078da0d021 (diff) | |
download | poky-a629b6ca5214496f2de29f1dff6a2612b5719fe6.tar.gz |
python: update to 2.7.17
Drop backports, rebase a couple of patches.
This is the second last release of py 2.x; upstream support ends on
1 January 2020, there will be one final 2.x afterwards.
Note that the only thing that still needs python 2.x in oe-core is
u-boot; when the next u-boot update arrives, we should find out
where the py3 migration is for that component before merging the
update.
(From OE-Core rev: 184b60eb905bb75ecc7a0c29a175e624d8555fac)
(From OE-Core rev: d8cd909e7c073eb6365732e5c906f52933fe2e66)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python-native')
-rw-r--r-- | meta/recipes-devtools/python/python-native/0001-python-native-fix-one-do_populate_sysroot-warning.patch | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/meta/recipes-devtools/python/python-native/0001-python-native-fix-one-do_populate_sysroot-warning.patch b/meta/recipes-devtools/python/python-native/0001-python-native-fix-one-do_populate_sysroot-warning.patch index 989818927d..707ee596fa 100644 --- a/meta/recipes-devtools/python/python-native/0001-python-native-fix-one-do_populate_sysroot-warning.patch +++ b/meta/recipes-devtools/python/python-native/0001-python-native-fix-one-do_populate_sysroot-warning.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 12292444e1b3662b994bc223d92b8338fb0895ff Mon Sep 17 00:00:00 2001 | 1 | From 6cbb7529cf7ff0da3ca649fb3486facd9620d625 Mon Sep 17 00:00:00 2001 |
2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | Date: Thu, 25 Oct 2018 07:32:14 +0000 | 3 | Date: Thu, 25 Oct 2018 07:32:14 +0000 |
4 | Subject: [PATCH] python-native: fix one do_populate_sysroot warning | 4 | Subject: [PATCH] python-native: fix one do_populate_sysroot warning |
@@ -17,23 +17,24 @@ when do_populate_sysroot. use append to fix it. | |||
17 | Upstream-Status: Inappropriate [oe-specific] | 17 | Upstream-Status: Inappropriate [oe-specific] |
18 | 18 | ||
19 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | 19 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
20 | |||
20 | --- | 21 | --- |
21 | setup.py | 2 +- | 22 | setup.py | 2 +- |
22 | 1 file changed, 1 insertion(+), 1 deletion(-) | 23 | 1 file changed, 1 insertion(+), 1 deletion(-) |
23 | 24 | ||
24 | diff --git a/setup.py b/setup.py | 25 | diff --git a/setup.py b/setup.py |
25 | index 7bf13ed..6c0f29b 100644 | 26 | index a2c8127..22f9e23 100644 |
26 | --- a/setup.py | 27 | --- a/setup.py |
27 | +++ b/setup.py | 28 | +++ b/setup.py |
28 | @@ -40,7 +40,7 @@ def add_dir_to_list(dirlist, dir): | 29 | @@ -47,7 +47,7 @@ def add_dir_to_list(dirlist, dir): |
29 | 1) 'dir' is not already in 'dirlist' | 30 | else: |
30 | 2) 'dir' actually exists, and is a directory.""" | 31 | dir_exists = os.path.isdir(dir) |
31 | if dir is not None and os.path.isdir(dir) and dir not in dirlist: | 32 | if dir_exists: |
32 | - dirlist.insert(0, dir) | 33 | - dirlist.insert(0, dir) |
33 | + dirlist.append(dir) | 34 | + dirlist.append(dir) |
34 | 35 | ||
35 | def macosx_sdk_root(): | 36 | MACOS_SDK_ROOT = None |
36 | """ | 37 | |
37 | -- | 38 | -- |
38 | 2.18.0 | 39 | 2.17.1 |
39 | 40 | ||