diff options
| author | Sona Sarmadi <sona.sarmadi@enea.com> | 2017-03-29 08:45:05 +0200 |
|---|---|---|
| committer | Adrian Dudau <adrian.dudau@enea.com> | 2017-04-03 16:13:30 +0200 |
| commit | dd5a3c0c80ac35b30b61296507bf5d3bd3a609d2 (patch) | |
| tree | 34572aba37e1c8398f672c616f977b0b81ac0281 /meta/conf/distro/include/default-versions.inc | |
| parent | 7e14191bb3bf457907727f3125e5cbc846d39b9f (diff) | |
| download | poky-dd5a3c0c80ac35b30b61296507bf5d3bd3a609d2.tar.gz | |
python/python-native: upgrade from 2.7.11 to 2.7.12
Rebases:
- default-versions.inc
- multilib.patch
- 01-use-proper-tools-for-cross-build.patch
- debug.patch
- python.inc
Upstream:
- avoid_parallel_make_races_on_pgen.patch
- CVE-2016-5636.patch
(Backported from OE-Core rev: adf4266524d0d1a7814d31496c3ecc6470644ec6)
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Diffstat (limited to 'meta/conf/distro/include/default-versions.inc')
| -rw-r--r-- | meta/conf/distro/include/default-versions.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc index a04ea718bd..aacb7280ff 100644 --- a/meta/conf/distro/include/default-versions.inc +++ b/meta/conf/distro/include/default-versions.inc | |||
| @@ -4,8 +4,8 @@ | |||
| 4 | 4 | ||
| 5 | # Force the python versions in one place | 5 | # Force the python versions in one place |
| 6 | PYTHON_BASEVERSION ?= "2.7" | 6 | PYTHON_BASEVERSION ?= "2.7" |
| 7 | PREFERRED_VERSION_python ?= "2.7.11" | 7 | PREFERRED_VERSION_python ?= "2.7.12" |
| 8 | PREFERRED_VERSION_python-native ?= "2.7.11" | 8 | PREFERRED_VERSION_python-native ?= "2.7.12" |
| 9 | 9 | ||
| 10 | # Force the older version of liberation-fonts until we fix the fontforge issue | 10 | # Force the older version of liberation-fonts until we fix the fontforge issue |
| 11 | PREFERRED_VERSION_liberation-fonts ?= "1.04" | 11 | PREFERRED_VERSION_liberation-fonts ?= "1.04" |