summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-05-01 10:23:29 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-03 15:48:04 +0100
commit7b08f6a9a11c76aa6b0910feb49accae5db25de3 (patch)
treed5333890dd7a553eef6b8a32a16e5ff446fb4fbb
parent4f4ab8bfe33283105112e81ee242a2e72527dd18 (diff)
downloadpoky-7b08f6a9a11c76aa6b0910feb49accae5db25de3.tar.gz
python: upgrade from 2.7.2 to 2.7.3
bin/python2 link is provided by the python install process, so no need to create it. rebase these patches to the newer code: fix_for_using_different_libdir.patch 04-default-is-optimized.patch remove this patch as it is upstream now: sys_platform_is_now_always_linux2.patch Change default python version to 2.7.3 in the distro config (From OE-Core rev: 5d92a95ea9b480235b7c9ca5949a681376eba725) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/default-versions.inc4
-rw-r--r--meta/recipes-devtools/python/python-native_2.7.3.bb (renamed from meta/recipes-devtools/python/python-native_2.7.2.bb)6
-rw-r--r--meta/recipes-devtools/python/python.inc8
-rw-r--r--meta/recipes-devtools/python/python/04-default-is-optimized.patch30
-rw-r--r--meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch30
-rw-r--r--meta/recipes-devtools/python/python/sys_platform_is_now_always_linux2.patch39
-rw-r--r--meta/recipes-devtools/python/python_2.7.3.bb (renamed from meta/recipes-devtools/python/python_2.7.2.bb)3
7 files changed, 43 insertions, 77 deletions
diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc
index a86bc0ce10..53ec2e7caf 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
6PYTHON_BASEVERSION ?= "2.7" 6PYTHON_BASEVERSION ?= "2.7"
7PREFERRED_VERSION_python ?= "2.7.2" 7PREFERRED_VERSION_python ?= "2.7.3"
8PREFERRED_VERSION_python-native ?= "2.7.2" 8PREFERRED_VERSION_python-native ?= "2.7.3"
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
11PREFERRED_VERSION_liberation-fonts ?= "1.04" 11PREFERRED_VERSION_liberation-fonts ?= "1.04"
diff --git a/meta/recipes-devtools/python/python-native_2.7.2.bb b/meta/recipes-devtools/python/python-native_2.7.3.bb
index 175f31d94e..50bf894d0c 100644
--- a/meta/recipes-devtools/python/python-native_2.7.2.bb
+++ b/meta/recipes-devtools/python/python-native_2.7.3.bb
@@ -1,6 +1,6 @@
1require python.inc 1require python.inc
2DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native" 2DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native"
3PR = "${INC_PR}.4" 3PR = "${INC_PR}.0"
4 4
5SRC_URI += "file://04-default-is-optimized.patch \ 5SRC_URI += "file://04-default-is-optimized.patch \
6 file://05-enable-ctypes-cross-build.patch \ 6 file://05-enable-ctypes-cross-build.patch \
@@ -13,7 +13,6 @@ SRC_URI += "file://04-default-is-optimized.patch \
13 file://nohostlibs.patch \ 13 file://nohostlibs.patch \
14 file://multilib.patch \ 14 file://multilib.patch \
15 file://add-md5module-support.patch \ 15 file://add-md5module-support.patch \
16 file://sys_platform_is_now_always_linux2.patch \
17 " 16 "
18S = "${WORKDIR}/Python-${PV}" 17S = "${WORKDIR}/Python-${PV}"
19 18
@@ -42,7 +41,4 @@ do_install() {
42 for PYTHSCRIPT in `grep -rIl ${bindir}/python ${D}${bindir}`; do 41 for PYTHSCRIPT in `grep -rIl ${bindir}/python ${D}${bindir}`; do
43 sed -i -e '1s|^#!.*|#!/usr/bin/env python|' $PYTHSCRIPT 42 sed -i -e '1s|^#!.*|#!/usr/bin/env python|' $PYTHSCRIPT
44 done 43 done
45
46 ln -sf python ${D}${bindir}/python2
47
48} 44}
diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc
index 2f17b00c25..eee7a64370 100644
--- a/meta/recipes-devtools/python/python.inc
+++ b/meta/recipes-devtools/python/python.inc
@@ -3,14 +3,14 @@ HOMEPAGE = "http://www.python.org"
3LICENSE = "PSFv2" 3LICENSE = "PSFv2"
4SECTION = "devel/python" 4SECTION = "devel/python"
5# bump this on every change in contrib/python/generate-manifest-2.7.py 5# bump this on every change in contrib/python/generate-manifest-2.7.py
6INC_PR = "r2" 6INC_PR = "r0"
7 7
8LIC_FILES_CHKSUM = "file://LICENSE;md5=2dffb81509b47974467ea23409909b1c" 8LIC_FILES_CHKSUM = "file://LICENSE;md5=ed3abfd1059e2d3a36a8cff3986f9bb6"
9 9
10SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2" 10SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2"
11 11
12SRC_URI[md5sum] = "ba7b2f11ffdbf195ee0d111b9455a5bd" 12SRC_URI[md5sum] = "c57477edd6d18bd9eeca2f21add73919"
13SRC_URI[sha256sum] = "5057eb067eb5b5a6040dbd0e889e06550bde9ec041dadaa855ee9490034cbdab" 13SRC_URI[sha256sum] = "726457e11cb153adc3f428aaf1901fc561a374c30e5e7da6742c0742a338663c"
14 14
15PYTHON_MAJMIN = "2.7" 15PYTHON_MAJMIN = "2.7"
16 16
diff --git a/meta/recipes-devtools/python/python/04-default-is-optimized.patch b/meta/recipes-devtools/python/python/04-default-is-optimized.patch
index 042ac5e46f..7ce819a3c9 100644
--- a/meta/recipes-devtools/python/python/04-default-is-optimized.patch
+++ b/meta/recipes-devtools/python/python/04-default-is-optimized.patch
@@ -1,14 +1,20 @@
1Upstream-Status: Inappropriate [embedded specific] 1Upstream-Status: Inappropriate [embedded specific]
2 2
3Updated original patch for python 2.7.3
4
5Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
62012/05/01
7
8
3# when compiling for an embedded system, we need every bit of 9# when compiling for an embedded system, we need every bit of
4# performance we can get. default to optimized with the option 10# performance we can get. default to optimized with the option
5# of opt-out. 11# of opt-out.
6# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de> 12# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de>
7 13
8Index: Python-2.6.6/Python/compile.c 14Index: Python-2.7.3/Python/compile.c
9=================================================================== 15===================================================================
10--- Python-2.6.6.orig/Python/compile.c 16--- Python-2.7.3.orig/Python/compile.c
11+++ Python-2.6.6/Python/compile.c 17+++ Python-2.7.3/Python/compile.c
12@@ -32,7 +32,7 @@ 18@@ -32,7 +32,7 @@
13 #include "symtable.h" 19 #include "symtable.h"
14 #include "opcode.h" 20 #include "opcode.h"
@@ -18,16 +24,16 @@ Index: Python-2.6.6/Python/compile.c
18 24
19 #define DEFAULT_BLOCK_SIZE 16 25 #define DEFAULT_BLOCK_SIZE 16
20 #define DEFAULT_BLOCKS 8 26 #define DEFAULT_BLOCKS 8
21Index: Python-2.6.6/Modules/main.c 27Index: Python-2.7.3/Modules/main.c
22=================================================================== 28===================================================================
23--- Python-2.6.6.orig/Modules/main.c 29--- Python-2.7.3.orig/Modules/main.c
24+++ Python-2.6.6/Modules/main.c 30+++ Python-2.7.3/Modules/main.c
25@@ -40,7 +40,7 @@ static char **orig_argv; 31@@ -40,7 +40,7 @@ static char **orig_argv;
26 static int orig_argc; 32 static int orig_argc;
27 33
28 /* command line options */ 34 /* command line options */
29-#define BASE_OPTS "3bBc:dEhiJm:OQ:sStuUvVW:xX?" 35-#define BASE_OPTS "3bBc:dEhiJm:OQ:RsStuUvVW:xX?"
30+#define BASE_OPTS "3bBc:dEhiJm:NOQ:sStuUvVW:xX?" 36+#define BASE_OPTS "3bBc:dEhiJm:NOQ:RsStuUvVW:xX?"
31 37
32 #ifndef RISCOS 38 #ifndef RISCOS
33 #define PROGRAM_OPTS BASE_OPTS 39 #define PROGRAM_OPTS BASE_OPTS
@@ -38,10 +44,10 @@ Index: Python-2.6.6/Modules/main.c
38--O : optimize generated bytecode slightly; also PYTHONOPTIMIZE=x\n\ 44--O : optimize generated bytecode slightly; also PYTHONOPTIMIZE=x\n\
39--OO : remove doc-strings in addition to the -O optimizations\n\ 45--OO : remove doc-strings in addition to the -O optimizations\n\
40+-N : do NOT optimize generated bytecode\n\ 46+-N : do NOT optimize generated bytecode\n\
41 -Q arg : division options: -Qold (default), -Qwarn, -Qwarnall, -Qnew\n\ 47 -R : use a pseudo-random salt to make hash() values of various types be\n\
42 -s : don't add user site directory to sys.path; also PYTHONNOUSERSITE\n\ 48 unpredictable between separate invocations of the interpreter, as\n\
43 -S : don't imply 'import site' on initialization\n\ 49 a defense against denial-of-service attacks\n\
44@@ -328,8 +327,8 @@ Py_Main(int argc, char **argv) 50@@ -365,8 +364,8 @@ Py_Main(int argc, char **argv)
45 51
46 /* case 'J': reserved for Jython */ 52 /* case 'J': reserved for Jython */
47 53
diff --git a/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch b/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch
index e8f19a24d8..50d3915425 100644
--- a/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch
+++ b/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch
@@ -7,10 +7,14 @@ in the install process of the host python.
7Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 7Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
8Date: 2012/03/14 8Date: 2012/03/14
9 9
10Index: Python-2.7.2/Lib/sysconfig.py 10Updated for python 2.7.3
11Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
12Date: 2012/05/01
13
14Index: Python-2.7.3/Lib/sysconfig.py
11=================================================================== 15===================================================================
12--- Python-2.7.2.orig/Lib/sysconfig.py 16--- Python-2.7.3.orig/Lib/sysconfig.py
13+++ Python-2.7.2/Lib/sysconfig.py 17+++ Python-2.7.3/Lib/sysconfig.py
14@@ -7,10 +7,10 @@ from os.path import pardir, realpath 18@@ -7,10 +7,10 @@ from os.path import pardir, realpath
15 19
16 _INSTALL_SCHEMES = { 20 _INSTALL_SCHEMES = {
@@ -41,14 +45,14 @@ Index: Python-2.7.2/Lib/sysconfig.py
41 'include': '{userbase}/include/python{py_version_short}', 45 'include': '{userbase}/include/python{py_version_short}',
42 'scripts': '{userbase}/bin', 46 'scripts': '{userbase}/bin',
43 'data' : '{userbase}', 47 'data' : '{userbase}',
44Index: Python-2.7.2/Makefile.pre.in 48Index: Python-2.7.3/Makefile.pre.in
45=================================================================== 49===================================================================
46--- Python-2.7.2.orig/Makefile.pre.in 50--- Python-2.7.3.orig/Makefile.pre.in
47+++ Python-2.7.2/Makefile.pre.in 51+++ Python-2.7.3/Makefile.pre.in
48@@ -928,25 +928,25 @@ libinstall: build_all $(srcdir)/Lib/$(PL 52@@ -941,25 +941,25 @@ libinstall: build_all $(srcdir)/Lib/$(PL
49 done; \ 53 $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
50 done 54 $(DESTDIR)$(LIBDEST)/distutils/tests ; \
51 $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt 55 fi
52- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ 56- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
53+ PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ 57+ PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
54 $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ 58 $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
@@ -56,7 +60,7 @@ Index: Python-2.7.2/Makefile.pre.in
56 -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ 60 -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
57 $(DESTDIR)$(LIBDEST) 61 $(DESTDIR)$(LIBDEST)
58- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ 62- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
59+ PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ 63+ PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
60 $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ 64 $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
61 -d $(LIBDEST) -f \ 65 -d $(LIBDEST) -f \
62 -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ 66 -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
@@ -67,12 +71,12 @@ Index: Python-2.7.2/Makefile.pre.in
67 -d $(LIBDEST)/site-packages -f \ 71 -d $(LIBDEST)/site-packages -f \
68 -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages 72 -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
69- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ 73- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
70+ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ 74+ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
71 $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ 75 $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
72 -d $(LIBDEST)/site-packages -f \ 76 -d $(LIBDEST)/site-packages -f \
73 -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages 77 -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
74- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ 78- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
75+ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ 79+ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
76 $(HOSTPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()" 80 $(HOSTPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
77 81
78 # Create the PLATDIR source directory, if one wasn't distributed.. 82 # Create the PLATDIR source directory, if one wasn't distributed..
diff --git a/meta/recipes-devtools/python/python/sys_platform_is_now_always_linux2.patch b/meta/recipes-devtools/python/python/sys_platform_is_now_always_linux2.patch
deleted file mode 100644
index ed529366c5..0000000000
--- a/meta/recipes-devtools/python/python/sys_platform_is_now_always_linux2.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1Upstream-Status: Accepted [http://hg.python.org/cpython/rev/c816479f6aaf/]
2Bugtracker: http://bugs.python.org/issue12326
3
4[Removed "Misc/NEWS" hunk]
5
6Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
7
8# HG changeset patch
9# User Victor Stinner <victor.stinner@haypocalc.com>
10# Date 1313841758 -7200
11# Node ID c816479f6aaf71dbd3f3fe4b239186d60c55ce48
12# Parent 3e093590ac57fdda428c7da3f72ddf0c475ecf2b
13Issue #12326: sys.platform is now always 'linux2' on Linux
14
15Even if Python is compiled on Linux 3.
16
17diff --git a/configure b/configure
18--- a/configure
19+++ b/configure
20@@ -2995,6 +2995,7 @@ then
21 MACHDEP="$ac_md_system$ac_md_release"
22
23 case $MACHDEP in
24+ linux*) MACHDEP="linux2";;
25 cygwin*) MACHDEP="cygwin";;
26 darwin*) MACHDEP="darwin";;
27 atheos*) MACHDEP="atheos";;
28diff --git a/configure.in b/configure.in
29--- a/configure.in
30+++ b/configure.in
31@@ -293,6 +293,7 @@ then
32 MACHDEP="$ac_md_system$ac_md_release"
33
34 case $MACHDEP in
35+ linux*) MACHDEP="linux2";;
36 cygwin*) MACHDEP="cygwin";;
37 darwin*) MACHDEP="darwin";;
38 atheos*) MACHDEP="atheos";;
39
diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.3.bb
index bd5c1ffde8..b06d7b7f90 100644
--- a/meta/recipes-devtools/python/python_2.7.2.bb
+++ b/meta/recipes-devtools/python/python_2.7.3.bb
@@ -1,6 +1,6 @@
1require python.inc 1require python.inc
2DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib" 2DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib"
3PR = "${INC_PR}.20" 3PR = "${INC_PR}.0"
4 4
5DISTRO_SRC_URI ?= "file://sitecustomize.py" 5DISTRO_SRC_URI ?= "file://sitecustomize.py"
6DISTRO_SRC_URI_linuxstdbase = "" 6DISTRO_SRC_URI_linuxstdbase = ""
@@ -19,7 +19,6 @@ SRC_URI += "\
19 file://setup_py_skip_cross_import_check.patch \ 19 file://setup_py_skip_cross_import_check.patch \
20 file://add-md5module-support.patch \ 20 file://add-md5module-support.patch \
21 file://host_include_contamination.patch \ 21 file://host_include_contamination.patch \
22 file://sys_platform_is_now_always_linux2.patch \
23 file://fix_for_using_different_libdir.patch \ 22 file://fix_for_using_different_libdir.patch \
24 file://setuptweaks.patch \ 23 file://setuptweaks.patch \
25 file://check-if-target-is-64b-not-host.patch \ 24 file://check-if-target-is-64b-not-host.patch \