On Tue, Oct 04, 2011 at 06:03:16AM -0500, Koen Kooi wrote: > > > Op 30 sep. 2011 om 13:37 heeft Martin Jansa <martin.ja...@gmail.com> het > volgende geschreven: > > > On Thu, Sep 29, 2011 at 06:27:11PM -0700, nitin.a.kam...@intel.com wrote: > >> From: Nitin A Kamble <nitin.a.kam...@intel.com> > >> > >> Rebased these patches to the newer code > >> modified: python-native/nohostlibs.patch > >> modified: python/01-use-proper-tools-for-cross-build.patch > >> modified: python/06-avoid_usr_lib_termcap_path_in_linking.patch > >> modified: python/06-ctypes-libffi-fix-configure.patch > >> modified: python/multilib.patch > >> > >> Deleted these patches are the are now upstream > >> deleted: python/02-remove-test-for-cross.patch > >> deleted: python/security_issue_2254_fix.patch > >> > >> Added this patch to python-native > >> new file: python-native/multilib.patch > >> > >> Updated site config files for python > >> modified: ../../site/arm-common > >> modified: ../../site/mips-common > >> > >> Updated default python version > >> modified: ../../conf/distro/include/default-versions.inc > >> > >> Signed-off-by: Nitin A Kamble <nitin.a.kam...@intel.com> > >> --- > >> meta/conf/distro/include/default-versions.inc | 6 +- > >> ...on-2.6-manifest.inc => python-2.7-manifest.inc} | 0 > >> .../python/python-native/multilib.patch | 240 > >> ++++++++++++++++++++ > >> .../python/python-native/nohostlibs.patch | 36 ++- > >> ...thon-native_2.6.6.bb => python-native_2.7.2.bb} | 13 +- > >> meta/recipes-devtools/python/python.inc | 16 +- > >> .../01-use-proper-tools-for-cross-build.patch | 118 +++++++--- > >> .../python/python/02-remove-test-for-cross.patch | 108 --------- > >> .../06-avoid_usr_lib_termcap_path_in_linking.patch | 16 +- > >> .../python/06-ctypes-libffi-fix-configure.patch | 42 ++--- > >> meta/recipes-devtools/python/python/multilib.patch | 126 ++++++----- > >> .../python/python/security_issue_2254_fix.patch | 184 --------------- > >> .../python/{python_2.6.6.bb => python_2.7.2.bb} | 10 +- > >> meta/site/arm-common | 3 + > >> meta/site/mips-common | 3 + > >> 15 files changed, 467 insertions(+), 454 deletions(-) > >> rename meta/recipes-devtools/python/{python-2.6-manifest.inc => > >> python-2.7-manifest.inc} (100%) > >> create mode 100644 > >> meta/recipes-devtools/python/python-native/multilib.patch > >> rename meta/recipes-devtools/python/{python-native_2.6.6.bb => > >> python-native_2.7.2.bb} (74%) > >> delete mode 100644 > >> meta/recipes-devtools/python/python/02-remove-test-for-cross.patch > >> delete mode 100644 > >> meta/recipes-devtools/python/python/security_issue_2254_fix.patch > >> rename meta/recipes-devtools/python/{python_2.6.6.bb => python_2.7.2.bb} > >> (92%) > >> > >> diff --git a/meta/conf/distro/include/default-versions.inc > >> b/meta/conf/distro/include/default-versions.inc > >> index e3ef1e6..90ff005 100644 > >> --- a/meta/conf/distro/include/default-versions.inc > >> +++ b/meta/conf/distro/include/default-versions.inc > >> @@ -4,9 +4,9 @@ > >> PREFERRED_VERSION_pulseaudio ?= "0.9.23" > >> > >> # Force the python versions in one place > >> -PYTHON_BASEVERSION ?= "2.6" > >> -PREFERRED_VERSION_python ?= "2.6.6" > >> -PREFERRED_VERSION_python-native ?= "2.6.6" > >> +PYTHON_BASEVERSION ?= "2.7" > >> +PREFERRED_VERSION_python ?= "2.7.2" > >> +PREFERRED_VERSION_python-native ?= "2.7.2" > >> > >> # Force the older version of liberation-fonts until we fix the fontforge > >> issue > >> PREFERRED_VERSION_liberation-fonts ?= "1.04" > >> diff --git a/meta/recipes-devtools/python/python-2.6-manifest.inc > >> b/meta/recipes-devtools/python/python-2.7-manifest.inc > >> similarity index 100% > >> rename from meta/recipes-devtools/python/python-2.6-manifest.inc > >> rename to meta/recipes-devtools/python/python-2.7-manifest.inc > > > > this is wrong.. just to rename it isn't enough > > It also drops the source checksums :(
They are moved to python.inc which is then included to both python and python-native recipes. But maybe we should drop DEFAULT_PREFERENCE = "-27" as there is only one python version anyways Regards, -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
_______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core