Recipes upgrades
cover Recipes upgrades
From: Nitin A Kamble <[email protected]>
The following changes since commit 9d1db6cc928199f8ac4960e8d4648563ef141427:
python: fix sqlite RPATH issue (2011-09-29 16:57:30 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib nitin/upgrades
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/upgrades
Nitin A Kamble (4):
gdb: upgrade from 7.3a to 7.3.1
byacc: upgrade from 20101229 to 20110908
python-dbus: upgrade from 0.83.2 to 0.84.0 python, python-native: upgrade from 2.6.6 to 2.7.2
meta/conf/distro/include/default-versions.inc | 6 +-
meta/recipes-devtools/gdb/gdb-common.inc | 4 +-
...anadian_7.3a.bb => gdb-cross-canadian_7.3.1.bb} | 2 +-
.../gdb/{gdb-cross_7.3a.bb => gdb-cross_7.3.1.bb} | 2 +-
.../gdb/{gdb_7.3a.bb => gdb_7.3.1.bb} | 2 +-
...on-2.6-manifest.inc => python-2.7-manifest.inc} | 0
...python-dbus_0.83.2.bb => python-dbus_0.84.0.bb} | 4 +-
.../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 +-
.../byacc/{byacc_20101229.bb => byacc_20110908.bb} | 4 +-
meta/site/arm-common | 3 +
meta/site/mips-common | 3 +
21 files changed, 476 insertions(+), 463 deletions(-)
rename meta/recipes-devtools/gdb/{gdb-cross-canadian_7.3a.bb => gdb-cross-canadian_7.3.1.bb} (83%)
rename meta/recipes-devtools/gdb/{gdb-cross_7.3a.bb => gdb-cross_7.3.1.bb} (78%)
rename meta/recipes-devtools/gdb/{gdb_7.3a.bb => gdb_7.3.1.bb} (91%)
rename meta/recipes-devtools/python/{python-2.6-manifest.inc => python-2.7-manifest.inc} (100%)
rename meta/recipes-devtools/python/{python-dbus_0.83.2.bb => python-dbus_0.84.0.bb} (83%)
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%)
rename meta/recipes-extended/byacc/{byacc_20101229.bb => byacc_20110908.bb} (49%)Signature · 1 line
1.7.4.4
PATCH 1/4 gdb: upgrade from 7.3a to 7.3.1
From: Nitin A Kamble <[email protected]>
---
meta/recipes-devtools/gdb/gdb-common.inc | 4 ++--
...anadian_7.3a.bb => gdb-cross-canadian_7.3.1.bb} | 2 +-
.../gdb/{gdb-cross_7.3a.bb => gdb-cross_7.3.1.bb} | 2 +-
.../gdb/{gdb_7.3a.bb => gdb_7.3.1.bb} | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
rename meta/recipes-devtools/gdb/{gdb-cross-canadian_7.3a.bb => gdb-cross-canadian_7.3.1.bb} (83%)
rename meta/recipes-devtools/gdb/{gdb-cross_7.3a.bb => gdb-cross_7.3.1.bb} (78%)
rename meta/recipes-devtools/gdb/{gdb_7.3a.bb => gdb_7.3.1.bb} (91%)meta/recipes-devtools/gdb/gdb-common.inc +2 -2
@@ -22,8 +22,8 @@ inherit autotools SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \ file://no-werror.patch" -SRC_URI[md5sum] = "9443a370dabd9ca9c41b496b59f05145" -SRC_URI[sha256sum] = "2c2b26eea33ab477ea1f7739a8e511b1e8d89b6f74d87cdd510c6262a3af82d7" +SRC_URI[md5sum] = "c2795d636a9481d022608cab201be613" +SRC_URI[sha256sum] = "d7d909b4b8ae0932ba6c1602f2f1f32bef60f0c71c72f1dd833ab6cb15e0d357" export CC_FOR_BUILD = "${BUILD_CC}" export CXX_FOR_BUILD = "${BUILD_CXX}"
meta/recipes-devtools/gdb/gdb-cross-canadian_7.3.1.bb renamed from meta/recipes-devtools/gdb/gdb-cross-canadian_7.3a.bb +1 -1
@@ -6,4 +6,4 @@ PR = "${INC_PR}.0" GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'" EXPAT = "--with-expat" -S = "${WORKDIR}/${BPN}-7.3" +S = "${WORKDIR}/${BPN}-${PN}"
meta/recipes-devtools/gdb/gdb-cross_7.3.1.bb renamed from meta/recipes-devtools/gdb/gdb-cross_7.3a.bb +1 -1
@@ -5,4 +5,4 @@ EXPAT = "--with-expat" PR = "${INC_PR}.0" -S = "${WORKDIR}/${BPN}-7.3" +S = "${WORKDIR}/${BPN}-${PV}"
meta/recipes-devtools/gdb/gdb_7.3.1.bb renamed from meta/recipes-devtools/gdb/gdb_7.3a.bb +1 -1
@@ -6,4 +6,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" PR = "${INC_PR}.0" -S = "${WORKDIR}/${BPN}-7.3" +S = "${WORKDIR}/${BPN}-${PV}"
Signature · 1 line
1.7.4.4
PATCH 2/4 byacc: upgrade from 20101229 to 20110908
From: Nitin A Kamble <[email protected]>
---
.../byacc/{byacc_20101229.bb => byacc_20110908.bb} | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/byacc/{byacc_20101229.bb => byacc_20110908.bb} (49%)meta/recipes-extended/byacc/byacc_20110908.bb renamed from meta/recipes-extended/byacc/byacc_20101229.bb +2 -2
@@ -3,5 +3,5 @@ LICENSE="other-BSD" LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=4dc4c30f840a7203fb6edf20b3db849e" require byacc.inc -SRC_URI[md5sum] = "e359702cda080c15f656a244aab132e5" -SRC_URI[sha256sum] = "67a5e4c7888bf7921949e38d4fd6eec855ec8b5a60d83f8d6f34eddb6d42a70c" +SRC_URI[md5sum] = "5665ee1f2ca482d57eef9591a2fe4768" +SRC_URI[sha256sum] = "70a3e491ddfae9da04646abe769fa0ecb9cbf003e2a09c5732907e3e8b478fb0"
Signature · 1 line
1.7.4.4
PATCH 3/4 python-dbus: upgrade from 0.83.2 to 0.84.0
In reply to [email protected]From: Nitin A Kamble <[email protected]>
---
...python-dbus_0.83.2.bb => python-dbus_0.84.0.bb} | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python-dbus_0.83.2.bb => python-dbus_0.84.0.bb} (83%)meta/recipes-devtools/python/python-dbus_0.84.0.bb renamed from meta/recipes-devtools/python/python-dbus_0.83.2.bb +2 -2
@@ -8,8 +8,8 @@ PR = "r0" SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz" -SRC_URI[md5sum] = "4ebcaa905bdcb4132b915196b0a3691b" -SRC_URI[sha256sum] = "883729c98f40790021e3be0f7028ae863ee1c4a7b922a5578c1342592adfff64" +SRC_URI[md5sum] = "fe69a2613e824463e74f10913708c88a" +SRC_URI[sha256sum] = "b85bc7aaf1a976627ca461b1ca7b0c4ddddff709f52fe44c9b2d1d7d8fac5906" S = "${WORKDIR}/dbus-python-${PV}" inherit distutils-base autotools pkgconfig
Signature · 1 line
1.7.4.4
PATCH 4/4 python, python-native: upgrade from 2.6.6 to 2.7.2
In reply to [email protected]From: Nitin A Kamble <[email protected]>
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
---
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%)meta/conf/distro/include/default-versions.inc +3 -3
@@ -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"
meta/recipes-devtools/python/python-2.7-manifest.inc renamed from meta/recipes-devtools/python/python-2.6-manifest.inc +0 -0
meta/recipes-devtools/python/python-native/multilib.patch new file +240 -0
240 lines not on this page · raw message
meta/recipes-devtools/python/python-native/nohostlibs.patch +24 -12
@@ -1,10 +1,14 @@ Upstream-Status: Inappropriate [embedded specific] -Index: Python-2.6.6/setup.py +2011/09/29 +rebased for python-2.7.2 +Signed-Off-By: Nitin A Kamble <[email protected]> + +Index: Python-2.7.2/setup.py =================================================================== ---- Python-2.6.6.orig/setup.py -+++ Python-2.6.6/setup.py -@@ -356,8 +356,8 @@ class PyBuildExt(build_ext): +--- Python-2.7.2.orig/setup.py ++++ Python-2.7.2/setup.py +@@ -369,8 +369,8 @@ class PyBuildExt(build_ext): def detect_modules(self): # Ensure that /usr/local is always used
@@ -12,16 +16,22 @@ Index: Python-2.6.6/setup.py - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + #add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') + #add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + self.add_multiarch_paths() # Add paths specified in the environment variables LDFLAGS and - # CPPFLAGS for header and library files. -@@ -393,10 +393,10 @@ class PyBuildExt(build_ext): +@@ -407,15 +407,15 @@ class PyBuildExt(build_ext): for directory in reversed(options.dirs): add_dir_to_list(dir_list, directory) -- if os.path.normpath(sys.prefix) != '/usr': +- if os.path.normpath(sys.prefix) != '/usr' \ +- and not sysconfig.get_config_var('PYTHONFRAMEWORK'): ++ #if os.path.normpath(sys.prefix) != '/usr' \ ++ #and not sysconfig.get_config_var('PYTHONFRAMEWORK'): + # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework + # (PYTHONFRAMEWORK is set) to avoid # linking problems when + # building a framework with different architectures than + # the one that is currently installed (issue #7473) - add_dir_to_list(self.compiler.library_dirs, -+ + add_dir_to_list(self.compiler.library_dirs, sysconfig.get_config_var("LIBDIR")) - add_dir_to_list(self.compiler.include_dirs,
@@ -29,7 +39,7 @@ Index: Python-2.6.6/setup.py sysconfig.get_config_var("INCLUDEDIR")) try: -@@ -407,11 +407,8 @@ class PyBuildExt(build_ext): +@@ -426,11 +426,8 @@ class PyBuildExt(build_ext): # lib_dirs and inc_dirs are used to search for files; # if a file is found in one of those directories, it can # be assumed that no additional -I,-L directives are needed.
@@ -43,13 +53,15 @@ Index: Python-2.6.6/setup.py exts = [] missing = [] -@@ -661,8 +658,7 @@ class PyBuildExt(build_ext): +@@ -676,9 +673,8 @@ class PyBuildExt(build_ext): pass # Issue 7384: Already linked against curses or tinfo. elif curses_library: readline_libs.append(curses_library) - elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], +- ['/usr/lib/termcap'], +- 'termcap'): + elif self.compiler.find_library_file(lib_dirs, - 'termcap'): ++ 'termcap'): readline_libs.append('termcap') exts.append( Extension('readline', ['readline.c'], + library_dirs=['/usr/lib/termcap'],
meta/recipes-devtools/python/python-native_2.7.2.bb renamed from meta/recipes-devtools/python/python-native_2.6.6.bb +4 -9
@@ -1,11 +1,8 @@ require python.inc DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native" -PR = "${INC_PR}.4" +PR = "${INC_PR}.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6" - -SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ - file://04-default-is-optimized.patch \ +SRC_URI += "file://04-default-is-optimized.patch \ file://05-enable-ctypes-cross-build.patch \ file://06-ctypes-libffi-fix-configure.patch \ file://10-distutils-fix-swig-parameter.patch \
@@ -13,12 +10,10 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ file://12-distutils-prefix-is-inside-staging-area.patch \ file://debug.patch \ file://unixccompiler.patch \ - file://nohostlibs.patch" + file://nohostlibs.patch \ + file://multilib.patch " S = "${WORKDIR}/Python-${PV}" -SRC_URI[md5sum] = "cf4e6881bb84a7ce6089e4a307f71f14" -SRC_URI[sha256sum] = "134c5e0736bae2e5570d0b915693374f11108ded63c35a23a35d282737d2ce83" - inherit native EXTRA_OEMAKE = '\
meta/recipes-devtools/python/python.inc +11 -5
@@ -1,13 +1,19 @@ DESCRIPTION = "The Python Programming Language" HOMEPAGE = "http://www.python.org" -LICENSE = "PSF" +LICENSE = "PSFv2" SECTION = "devel/python" -# bump this on every change in contrib/python/generate-manifest-2.6.py -INC_PR = "r2" +# bump this on every change in contrib/python/generate-manifest-2.7.py +INC_PR = "r0" -DEFAULT_PREFERENCE = "-26" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2dffb81509b47974467ea23409909b1c" -PYTHON_MAJMIN = "2.6" +SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2" + +SRC_URI[md5sum] = "ba7b2f11ffdbf195ee0d111b9455a5bd" +SRC_URI[sha256sum] = "5057eb067eb5b5a6040dbd0e889e06550bde9ec041dadaa855ee9490034cbdab" +DEFAULT_PREFERENCE = "-27" + +PYTHON_MAJMIN = "2.7" inherit autotools
meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch +88 -30
183 lines not on this page · raw message
meta/recipes-devtools/python/python/02-remove-test-for-cross.patch deleted +0 -108
108 lines not on this page · raw message
meta/recipes-devtools/python/python/06-avoid_usr_lib_termcap_path_in_linking.patch +10 -6
@@ -9,18 +9,22 @@ This Patch fixes this issue in the python build environment. 11 Oct 2010 Nitin A Kamble <[email protected]> -Index: Python-2.6.6/setup.py +2011/09/29 +Rebased for python 2.7.2 +Signed-Off-By: Nitin A Kamble <[email protected]> + +Index: Python-2.7.2/setup.py =================================================================== ---- Python-2.6.6.orig/setup.py -+++ Python-2.6.6/setup.py -@@ -665,12 +665,10 @@ class PyBuildExt(build_ext): +--- Python-2.7.2.orig/setup.py ++++ Python-2.7.2/setup.py +@@ -680,12 +680,10 @@ class PyBuildExt(build_ext): pass # Issue 7384: Already linked against curses or tinfo. elif curses_library: readline_libs.append(curses_library) - elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], +- ['/usr/lib/termcap'], + elif self.compiler.find_library_file(lib_dirs, - 'termcap'): + 'termcap'): readline_libs.append('termcap') exts.append( Extension('readline', ['readline.c'], - library_dirs=['/usr/lib/termcap'],
meta/recipes-devtools/python/python/06-ctypes-libffi-fix-configure.patch +14 -28
57 lines not on this page · raw message
meta/recipes-devtools/python/python/multilib.patch +65 -61
233 lines not on this page · raw message
meta/recipes-devtools/python/python/security_issue_2254_fix.patch deleted +0 -184
184 lines not on this page · raw message
meta/recipes-devtools/python/python_2.7.2.bb renamed from meta/recipes-devtools/python/python_2.6.6.bb +2 -8
@@ -1,15 +1,12 @@ require python.inc DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib" DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" -PR = "${INC_PR}.11" -LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6" +PR = "${INC_PR}.0" DISTRO_SRC_URI ?= "file://sitecustomize.py" DISTRO_SRC_URI_linuxstdbase = "" -SRC_URI = "\ - http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ +SRC_URI += "\ file://01-use-proper-tools-for-cross-build.patch \ - file://02-remove-test-for-cross.patch \ file://03-fix-tkinter-detection.patch \ file://04-default-is-optimized.patch \ file://05-enable-ctypes-cross-build.patch \
@@ -19,13 +16,10 @@ SRC_URI = "\ file://99-ignore-optimization-flag.patch \ ${DISTRO_SRC_URI} \ file://multilib.patch \ - file://security_issue_2254_fix.patch \ file://cgi_py.patch \ file://remove_sqlite_rpath.patch \ " -SRC_URI[md5sum] = "cf4e6881bb84a7ce6089e4a307f71f14" -SRC_URI[sha256sum] = "134c5e0736bae2e5570d0b915693374f11108ded63c35a23a35d282737d2ce83" S = "${WORKDIR}/Python-${PV}" inherit autotools
meta/site/arm-common +3 -0
@@ -182,3 +182,6 @@ jm_cv_func_working_readdir=yes # eds-dbus ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes} + +# python +ac_cv_have_long_long_format=yes
meta/site/mips-common +3 -0
@@ -40,3 +40,6 @@ glib_cv_va_val_copy=${glib_cv_va_val_copy=yes} # slrn slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes} + +#python +ac_cv_have_long_long_format=yes
Signature · 1 line
1.7.4.4
Re: [PATCH 4/4] python, python-native: upgrade from 2.6.6 to 2.7.2
meta/recipes-devtools/python/python-2.7-manifest.inc
Quoted 69 lines · On Thu, Sep 29, 2011 at 06:27:11PM -0700, [email protected] wrote:
From: Nitin A Kamble <[email protected]>
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.patchDeleted these patches are the are now upstream
deleted:python/02-remove-test-for-cross.patch
deleted:python/security_issue_2254_fix.patchAdded this patch to python-native
new file:python-native/multilib.patchUpdated site config files for python
modified: ../../site/arm-common modified: ../../site/mips-commonUpdated default python version
modified: ../../conf/distro/include/default-versions.incSigned-off-by Nitin A Kamble <[email protected]>--- 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%)meta/conf/distro/include/default-versions.inc +3
-3@@ -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"meta/recipes-devtools/python/python-2.7-manifest.inc renamed from meta/recipes-devtools/python/python-2.6-manifest.inc +0
-0
this is wrong.. just to rename it isn't enough
I will send patch which regenerates manifest with right paths to actually package something..
Regards,
PATCH 1/1 python: update generate-manifest for 2.7 version and regenerate it
* it needs to be regenerated to actually package something
---
.../python/python-2.7-manifest.inc | 124 ++++++++++----------
...te-manifest-2.6.py => generate-manifest-2.7.py} | 2 +-
2 files changed, 63 insertions(+), 63 deletions(-)
rename scripts/contrib/python/{generate-manifest-2.6.py => generate-manifest-2.7.py} (99%)meta/recipes-devtools/python/python-2.7-manifest.inc +62 -62
@@ -1,6 +1,6 @@ # WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file. -# Generator: '../../../scripts/contrib/python/generate-manifest-2.6.py' Version 20110222 (C) 2002-2010 Michael 'Mickey' Lauer <[email protected]> +# Generator: 'scripts/contrib/python/generate-manifest-2.7.py' Version 20110222.1 (C) 2002-2010 Michael 'Mickey' Lauer <[email protected]> # Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
@@ -11,55 +11,55 @@ PACKAGES="${PN}-dbg ${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-com DESCRIPTION_${PN}-audio="Python Audio Handling" RDEPENDS_${PN}-audio="${PN}-core" -FILES_${PN}-audio="${libdir}/python2.6/wave.* ${libdir}/python2.6/chunk.* ${libdir}/python2.6/sndhdr.* ${libdir}/python2.6/lib-dynload/ossaudiodev.so ${libdir}/python2.6/lib-dynload/audioop.so " +FILES_${PN}-audio="${libdir}/python2.7/wave.* ${libdir}/python2.7/chunk.* ${libdir}/python2.7/sndhdr.* ${libdir}/python2.7/lib-dynload/ossaudiodev.so ${libdir}/python2.7/lib-dynload/audioop.so " DESCRIPTION_${PN}-bsddb="Python Berkeley Database Bindings" RDEPENDS_${PN}-bsddb="${PN}-core" -FILES_${PN}-bsddb="${libdir}/python2.6/bsddb ${libdir}/python2.6/lib-dynload/_bsddb.so " +FILES_${PN}-bsddb="${libdir}/python2.7/bsddb ${libdir}/python2.7/lib-dynload/_bsddb.so " DESCRIPTION_${PN}-codecs="Python Codecs, Encodings & i18n Support" RDEPENDS_${PN}-codecs="${PN}-core ${PN}-lang" -FILES_${PN}-codecs="${libdir}/python2.6/codecs.* ${libdir}/python2.6/encodings ${libdir}/python2.6/gettext.* ${libdir}/python2.6/locale.* ${libdir}/python2.6/lib-dynload/_locale.so ${libdir}/python2.6/lib-dynload/unicodedata.so ${libdir}/python2.6/stringprep.* ${libdir}/python2.6/xdrlib.* " +FILES_${PN}-codecs="${libdir}/python2.7/codecs.* ${libdir}/python2.7/encodings ${libdir}/python2.7/gettext.* ${libdir}/python2.7/locale.* ${libdir}/python2.7/lib-dynload/_locale.so ${libdir}/python2.7/lib-dynload/unicodedata.so ${libdir}/python2.7/stringprep.* ${libdir}/python2.7/xdrlib.* " DESCRIPTION_${PN}-compile="Python Bytecode Compilation Support" RDEPENDS_${PN}-compile="${PN}-core" -FILES_${PN}-compile="${libdir}/python2.6/py_compile.* ${libdir}/python2.6/compileall.* " +FILES_${PN}-compile="${libdir}/python2.7/py_compile.* ${libdir}/python2.7/compileall.* " DESCRIPTION_${PN}-compiler="Python Compiler Support" RDEPENDS_${PN}-compiler="${PN}-core" -FILES_${PN}-compiler="${libdir}/python2.6/compiler " +FILES_${PN}-compiler="${libdir}/python2.7/compiler " DESCRIPTION_${PN}-compression="Python High Level Compression Support" RDEPENDS_${PN}-compression="${PN}-core ${PN}-zlib" -FILES_${PN}-compression="${libdir}/python2.6/gzip.* ${libdir}/python2.6/zipfile.* ${libdir}/python2.6/tarfile.* ${libdir}/python2.6/lib-dynload/bz2.so " +FILES_${PN}-compression="${libdir}/python2.7/gzip.* ${libdir}/python2.7/zipfile.* ${libdir}/python2.7/tarfile.* ${libdir}/python2.7/lib-dynload/bz2.so " DESCRIPTION_${PN}-core="Python Interpreter and core modules (needed!)" RDEPENDS_${PN}-core="" -FILES_${PN}-core="${libdir}/python2.6/__future__.* ${libdir}/python2.6/_abcoll.* ${libdir}/python2.6/abc.* ${libdir}/python2.6/copy.* ${libdir}/python2.6/copy_reg.* ${libdir}/python2.6/ConfigParser.* ${libdir}/python2.6/genericpath.* ${libdir}/python2.6/getopt.* ${libdir}/python2.6/linecache.* ${libdir}/python2.6/new.* ${libdir}/python2.6/os.* ${libdir}/python2.6/posixpath.* ${libdir}/python2.6/struct.* ${libdir}/python2.6/warnings.* ${libdir}/python2.6/site.* ${libdir}/python2.6/stat.* ${libdir}/python2.6/UserDict.* ${libdir}/python2.6/UserList.* ${libdir}/python2.6/UserString.* ${libdir}/python2.6/lib-dynload/binascii.so ${libdir}/python2.6/lib-dynload/_struct.so ${libdir}/python2.6/lib-dynload/time.so ${libdir}/python2.6/lib-dynload/xreadlines.so ${libdir}/python2.6/types.* ${libdir}/python2.6/platform.* ${bindir}/python* " +FILES_${PN}-core="${libdir}/python2.7/__future__.* ${libdir}/python2.7/_abcoll.* ${libdir}/python2.7/abc.* ${libdir}/python2.7/copy.* ${libdir}/python2.7/copy_reg.* ${libdir}/python2.7/ConfigParser.* ${libdir}/python2.7/genericpath.* ${libdir}/python2.7/getopt.* ${libdir}/python2.7/linecache.* ${libdir}/python2.7/new.* ${libdir}/python2.7/os.* ${libdir}/python2.7/posixpath.* ${libdir}/python2.7/struct.* ${libdir}/python2.7/warnings.* ${libdir}/python2.7/site.* ${libdir}/python2.7/stat.* ${libdir}/python2.7/UserDict.* ${libdir}/python2.7/UserList.* ${libdir}/python2.7/UserString.* ${libdir}/python2.7/lib-dynload/binascii.so ${libdir}/python2.7/lib-dynload/_struct.so ${libdir}/python2.7/lib-dynload/time.so ${libdir}/python2.7/lib-dynload/xreadlines.so ${libdir}/python2.7/types.* ${libdir}/python2.7/platform.* ${bindir}/python* " DESCRIPTION_${PN}-crypt="Python Basic Cryptographic and Hashing Support" RDEPENDS_${PN}-crypt="${PN}-core" -FILES_${PN}-crypt="${libdir}/python2.6/hashlib.* ${libdir}/python2.6/md5.* ${libdir}/python2.6/sha.* ${libdir}/python2.6/lib-dynload/crypt.so ${libdir}/python2.6/lib-dynload/_hashlib.so ${libdir}/python2.6/lib-dynload/_sha256.so ${libdir}/python2.6/lib-dynload/_sha512.so " +FILES_${PN}-crypt="${libdir}/python2.7/hashlib.* ${libdir}/python2.7/md5.* ${libdir}/python2.7/sha.* ${libdir}/python2.7/lib-dynload/crypt.so ${libdir}/python2.7/lib-dynload/_hashlib.so ${libdir}/python2.7/lib-dynload/_sha256.so ${libdir}/python2.7/lib-dynload/_sha512.so " DESCRIPTION_${PN}-ctypes="Python C Types Support" RDEPENDS_${PN}-ctypes="${PN}-core" -FILES_${PN}-ctypes="${libdir}/python2.6/ctypes ${libdir}/python2.6/lib-dynload/_ctypes.so " +FILES_${PN}-ctypes="${libdir}/python2.7/ctypes ${libdir}/python2.7/lib-dynload/_ctypes.so " DESCRIPTION_${PN}-curses="Python Curses Support" RDEPENDS_${PN}-curses="${PN}-core" -FILES_${PN}-curses="${libdir}/python2.6/curses ${libdir}/python2.6/lib-dynload/_curses.so ${libdir}/python2.6/lib-dynload/_curses_panel.so " +FILES_${PN}-curses="${libdir}/python2.7/curses ${libdir}/python2.7/lib-dynload/_curses.so ${libdir}/python2.7/lib-dynload/_curses_panel.so " DESCRIPTION_${PN}-datetime="Python Calendar and Time support" RDEPENDS_${PN}-datetime="${PN}-core ${PN}-codecs" -FILES_${PN}-datetime="${libdir}/python2.6/_strptime.* ${libdir}/python2.6/calendar.* ${libdir}/python2.6/lib-dynload/datetime.so " +FILES_${PN}-datetime="${libdir}/python2.7/_strptime.* ${libdir}/python2.7/calendar.* ${libdir}/python2.7/lib-dynload/datetime.so " DESCRIPTION_${PN}-db="Python File-Based Database Support" RDEPENDS_${PN}-db="${PN}-core" -FILES_${PN}-db="${libdir}/python2.6/anydbm.* ${libdir}/python2.6/dumbdbm.* ${libdir}/python2.6/whichdb.* " +FILES_${PN}-db="${libdir}/python2.7/anydbm.* ${libdir}/python2.7/dumbdbm.* ${libdir}/python2.7/whichdb.* " DESCRIPTION_${PN}-debugger="Python Debugger" RDEPENDS_${PN}-debugger="${PN}-core ${PN}-io ${PN}-lang ${PN}-re ${PN}-stringold ${PN}-shell ${PN}-pprint" -FILES_${PN}-debugger="${libdir}/python2.6/bdb.* ${libdir}/python2.6/pdb.* " +FILES_${PN}-debugger="${libdir}/python2.7/bdb.* ${libdir}/python2.7/pdb.* " DESCRIPTION_${PN}-dev="Python Development Package" RDEPENDS_${PN}-dev="${PN}-core"
@@ -67,135 +67,135 @@ FILES_${PN}-dev="${includedir} ${libdir}/libpython2.6.so " DESCRIPTION_${PN}-difflib="Python helpers for computing deltas between objects." RDEPENDS_${PN}-difflib="${PN}-lang ${PN}-re" -FILES_${PN}-difflib="${libdir}/python2.6/difflib.* " +FILES_${PN}-difflib="${libdir}/python2.7/difflib.* " DESCRIPTION_${PN}-distutils="Python Distribution Utilities" RDEPENDS_${PN}-distutils="${PN}-core" -FILES_${PN}-distutils="${libdir}/python2.6/config ${libdir}/python2.6/distutils " +FILES_${PN}-distutils="${libdir}/python2.7/config ${libdir}/python2.7/distutils " DESCRIPTION_${PN}-doctest="Python framework for running examples in docstrings." RDEPENDS_${PN}-doctest="${PN}-core ${PN}-lang ${PN}-io ${PN}-re ${PN}-unittest ${PN}-debugger ${PN}-difflib" -FILES_${PN}-doctest="${libdir}/python2.6/doctest.* " +FILES_${PN}-doctest="${libdir}/python2.7/doctest.* " DESCRIPTION_${PN}-elementtree="Python elementree" RDEPENDS_${PN}-elementtree="${PN}-core" -FILES_${PN}-elementtree="${libdir}/python2.6/lib-dynload/_elementtree.so " +FILES_${PN}-elementtree="${libdir}/python2.7/lib-dynload/_elementtree.so " DESCRIPTION_${PN}-email="Python Email Support" RDEPENDS_${PN}-email="${PN}-core ${PN}-io ${PN}-re ${PN}-mime ${PN}-audio ${PN}-image ${PN}-netclient" -FILES_${PN}-email="${libdir}/python2.6/imaplib.* ${libdir}/python2.6/email " +FILES_${PN}-email="${libdir}/python2.7/imaplib.* ${libdir}/python2.7/email " DESCRIPTION_${PN}-fcntl="Python's fcntl Interface" RDEPENDS_${PN}-fcntl="${PN}-core" -FILES_${PN}-fcntl="${libdir}/python2.6/lib-dynload/fcntl.so " +FILES_${PN}-fcntl="${libdir}/python2.7/lib-dynload/fcntl.so " DESCRIPTION_${PN}-gdbm="Python GNU Database Support" RDEPENDS_${PN}-gdbm="${PN}-core" -FILES_${PN}-gdbm="${libdir}/python2.6/lib-dynload/gdbm.so " +FILES_${PN}-gdbm="${libdir}/python2.7/lib-dynload/gdbm.so " DESCRIPTION_${PN}-hotshot="Python Hotshot Profiler" RDEPENDS_${PN}-hotshot="${PN}-core" -FILES_${PN}-hotshot="${libdir}/python2.6/hotshot ${libdir}/python2.6/lib-dynload/_hotshot.so " +FILES_${PN}-hotshot="${libdir}/python2.7/hotshot ${libdir}/python2.7/lib-dynload/_hotshot.so " DESCRIPTION_${PN}-html="Python HTML Processing" RDEPENDS_${PN}-html="${PN}-core" -FILES_${PN}-html="${libdir}/python2.6/formatter.* ${libdir}/python2.6/htmlentitydefs.* ${libdir}/python2.6/htmllib.* ${libdir}/python2.6/markupbase.* ${libdir}/python2.6/sgmllib.* " +FILES_${PN}-html="${libdir}/python2.7/formatter.* ${libdir}/python2.7/htmlentitydefs.* ${libdir}/python2.7/htmllib.* ${libdir}/python2.7/markupbase.* ${libdir}/python2.7/sgmllib.* " DESCRIPTION_${PN}-idle="Python Integrated Development Environment" RDEPENDS_${PN}-idle="${PN}-core ${PN}-tkinter" -FILES_${PN}-idle="${bindir}/idle ${libdir}/python2.6/idlelib " +FILES_${PN}-idle="${bindir}/idle ${libdir}/python2.7/idlelib " DESCRIPTION_${PN}-image="Python Graphical Image Handling" RDEPENDS_${PN}-image="${PN}-core" -FILES_${PN}-image="${libdir}/python2.6/colorsys.* ${libdir}/python2.6/imghdr.* ${libdir}/python2.6/lib-dynload/imageop.so ${libdir}/python2.6/lib-dynload/rgbimg.so " +FILES_${PN}-image="${libdir}/python2.7/colorsys.* ${libdir}/python2.7/imghdr.* ${libdir}/python2.7/lib-dynload/imageop.so ${libdir}/python2.7/lib-dynload/rgbimg.so " DESCRIPTION_${PN}-io="Python Low-Level I/O" RDEPENDS_${PN}-io="${PN}-core ${PN}-math" -FILES_${PN}-io="${libdir}/python2.6/lib-dynload/_socket.so ${libdir}/python2.6/lib-dynload/_ssl.so ${libdir}/python2.6/lib-dynload/select.so ${libdir}/python2.6/lib-dynload/termios.so ${libdir}/python2.6/lib-dynload/cStringIO.so ${libdir}/python2.6/pipes.* ${libdir}/python2.6/socket.* ${libdir}/python2.6/ssl.* ${libdir}/python2.6/tempfile.* ${libdir}/python2.6/StringIO.* " +FILES_${PN}-io="${libdir}/python2.7/lib-dynload/_socket.so ${libdir}/python2.7/lib-dynload/_ssl.so ${libdir}/python2.7/lib-dynload/select.so ${libdir}/python2.7/lib-dynload/termios.so ${libdir}/python2.7/lib-dynload/cStringIO.so ${libdir}/python2.7/pipes.* ${libdir}/python2.7/socket.* ${libdir}/python2.7/ssl.* ${libdir}/python2.7/tempfile.* ${libdir}/python2.7/StringIO.* " DESCRIPTION_${PN}-json="Python JSON Support" RDEPENDS_${PN}-json="${PN}-core ${PN}-math ${PN}-re" -FILES_${PN}-json="${libdir}/python2.6/json " +FILES_${PN}-json="${libdir}/python2.7/json " DESCRIPTION_${PN}-lang="Python Low-Level Language Support" RDEPENDS_${PN}-lang="${PN}-core" -FILES_${PN}-lang="${libdir}/python2.6/lib-dynload/_bisect.so ${libdir}/python2.6/lib-dynload/_collections.so ${libdir}/python2.6/lib-dynload/_heapq.so ${libdir}/python2.6/lib-dynload/_weakref.so ${libdir}/python2.6/lib-dynload/_functools.so ${libdir}/python2.6/lib-dynload/array.so ${libdir}/python2.6/lib-dynload/itertools.so ${libdir}/python2.6/lib-dynload/operator.so ${libdir}/python2.6/lib-dynload/parser.so ${libdir}/python2.6/atexit.* ${libdir}/python2.6/bisect.* ${libdir}/python2.6/code.* ${libdir}/python2.6/codeop.* ${libdir}/python2.6/collections.* ${libdir}/python2.6/dis.* ${libdir}/python2.6/functools.* ${libdir}/python2.6/heapq.* ${libdir}/python2.6/inspect.* ${libdir}/python2.6/keyword.* ${libdir}/python2.6/opcode.* ${libdir}/python2.6/symbol.* ${libdir}/python2.6/repr.* ${libdir}/python2.6/token.* ${libdir}/python2.6/tokenize.* ${libdir}/python2.6/traceback.* ${libdir}/python2.6/weakref.* " +FILES_${PN}-lang="${libdir}/python2.7/lib-dynload/_bisect.so ${libdir}/python2.7/lib-dynload/_collections.so ${libdir}/python2.7/lib-dynload/_heapq.so ${libdir}/python2.7/lib-dynload/_weakref.so ${libdir}/python2.7/lib-dynload/_functools.so ${libdir}/python2.7/lib-dynload/array.so ${libdir}/python2.7/lib-dynload/itertools.so ${libdir}/python2.7/lib-dynload/operator.so ${libdir}/python2.7/lib-dynload/parser.so ${libdir}/python2.7/atexit.* ${libdir}/python2.7/bisect.* ${libdir}/python2.7/code.* ${libdir}/python2.7/codeop.* ${libdir}/python2.7/collections.* ${libdir}/python2.7/dis.* ${libdir}/python2.7/functools.* ${libdir}/python2.7/heapq.* ${libdir}/python2.7/inspect.* ${libdir}/python2.7/keyword.* ${libdir}/python2.7/opcode.* ${libdir}/python2.7/symbol.* ${libdir}/python2.7/repr.* ${libdir}/python2.7/token.* ${libdir}/python2.7/tokenize.* ${libdir}/python2.7/traceback.* ${libdir}/python2.7/weakref.* " DESCRIPTION_${PN}-logging="Python Logging Support" RDEPENDS_${PN}-logging="${PN}-core ${PN}-io ${PN}-lang ${PN}-pickle ${PN}-stringold" -FILES_${PN}-logging="${libdir}/python2.6/logging " +FILES_${PN}-logging="${libdir}/python2.7/logging " DESCRIPTION_${PN}-mailbox="Python Mailbox Format Support" RDEPENDS_${PN}-mailbox="${PN}-core ${PN}-mime" -FILES_${PN}-mailbox="${libdir}/python2.6/mailbox.* " +FILES_${PN}-mailbox="${libdir}/python2.7/mailbox.* " DESCRIPTION_${PN}-math="Python Math Support" RDEPENDS_${PN}-math="${PN}-core" -FILES_${PN}-math="${libdir}/python2.6/lib-dynload/cmath.so ${libdir}/python2.6/lib-dynload/math.so ${libdir}/python2.6/lib-dynload/_random.so ${libdir}/python2.6/random.* ${libdir}/python2.6/sets.* " +FILES_${PN}-math="${libdir}/python2.7/lib-dynload/cmath.so ${libdir}/python2.7/lib-dynload/math.so ${libdir}/python2.7/lib-dynload/_random.so ${libdir}/python2.7/random.* ${libdir}/python2.7/sets.* " DESCRIPTION_${PN}-mime="Python MIME Handling APIs" RDEPENDS_${PN}-mime="${PN}-core ${PN}-io" -FILES_${PN}-mime="${libdir}/python2.6/mimetools.* ${libdir}/python2.6/uu.* ${libdir}/python2.6/quopri.* ${libdir}/python2.6/rfc822.* " +FILES_${PN}-mime="${libdir}/python2.7/mimetools.* ${libdir}/python2.7/uu.* ${libdir}/python2.7/quopri.* ${libdir}/python2.7/rfc822.* " DESCRIPTION_${PN}-mmap="Python Memory-Mapped-File Support" RDEPENDS_${PN}-mmap="${PN}-core ${PN}-io" -FILES_${PN}-mmap="${libdir}/python2.6/lib-dynload/mmap.so " +FILES_${PN}-mmap="${libdir}/python2.7/lib-dynload/mmap.so " DESCRIPTION_${PN}-multiprocessing="Python Multiprocessing Support" RDEPENDS_${PN}-multiprocessing="${PN}-core ${PN}-io ${PN}-lang" -FILES_${PN}-multiprocessing="${libdir}/python2.6/lib-dynload/_multiprocessing.so ${libdir}/python2.6/multiprocessing " +FILES_${PN}-multiprocessing="${libdir}/python2.7/lib-dynload/_multiprocessing.so ${libdir}/python2.7/multiprocessing " DESCRIPTION_${PN}-netclient="Python Internet Protocol Clients" RDEPENDS_${PN}-netclient="${PN}-core ${PN}-crypt ${PN}-datetime ${PN}-io ${PN}-lang ${PN}-logging ${PN}-mime" -FILES_${PN}-netclient="${libdir}/python2.6/*Cookie*.* ${libdir}/python2.6/base64.* ${libdir}/python2.6/cookielib.* ${libdir}/python2.6/ftplib.* ${libdir}/python2.6/gopherlib.* ${libdir}/python2.6/hmac.* ${libdir}/python2.6/httplib.* ${libdir}/python2.6/mimetypes.* ${libdir}/python2.6/nntplib.* ${libdir}/python2.6/poplib.* ${libdir}/python2.6/smtplib.* ${libdir}/python2.6/telnetlib.* ${libdir}/python2.6/urllib.* ${libdir}/python2.6/urllib2.* ${libdir}/python2.6/urlparse.* ${libdir}/python2.6/uuid.* ${libdir}/python2.6/rfc822.* ${libdir}/python2.6/mimetools.* " +FILES_${PN}-netclient="${libdir}/python2.7/*Cookie*.* ${libdir}/python2.7/base64.* ${libdir}/python2.7/cookielib.* ${libdir}/python2.7/ftplib.* ${libdir}/python2.7/gopherlib.* ${libdir}/python2.7/hmac.* ${libdir}/python2.7/httplib.* ${libdir}/python2.7/mimetypes.* ${libdir}/python2.7/nntplib.* ${libdir}/python2.7/poplib.* ${libdir}/python2.7/smtplib.* ${libdir}/python2.7/telnetlib.* ${libdir}/python2.7/urllib.* ${libdir}/python2.7/urllib2.* ${libdir}/python2.7/urlparse.* ${libdir}/python2.7/uuid.* ${libdir}/python2.7/rfc822.* ${libdir}/python2.7/mimetools.* " DESCRIPTION_${PN}-netserver="Python Internet Protocol Servers" RDEPENDS_${PN}-netserver="${PN}-core ${PN}-netclient" -FILES_${PN}-netserver="${libdir}/python2.6/cgi.* ${libdir}/python2.6/*HTTPServer.* ${libdir}/python2.6/SocketServer.* " +FILES_${PN}-netserver="${libdir}/python2.7/cgi.* ${libdir}/python2.7/*HTTPServer.* ${libdir}/python2.7/SocketServer.* " DESCRIPTION_${PN}-numbers="Python Number APIs" RDEPENDS_${PN}-numbers="${PN}-core ${PN}-lang ${PN}-re" -FILES_${PN}-numbers="${libdir}/python2.6/decimal.* ${libdir}/python2.6/numbers.* " +FILES_${PN}-numbers="${libdir}/python2.7/decimal.* ${libdir}/python2.7/numbers.* " DESCRIPTION_${PN}-pickle="Python Persistence Support" RDEPENDS_${PN}-pickle="${PN}-core ${PN}-codecs ${PN}-io ${PN}-re" -FILES_${PN}-pickle="${libdir}/python2.6/pickle.* ${libdir}/python2.6/shelve.* ${libdir}/python2.6/lib-dynload/cPickle.so " +FILES_${PN}-pickle="${libdir}/python2.7/pickle.* ${libdir}/python2.7/shelve.* ${libdir}/python2.7/lib-dynload/cPickle.so " DESCRIPTION_${PN}-pkgutil="Python Package Extension Utility Support" RDEPENDS_${PN}-pkgutil="${PN}-core" -FILES_${PN}-pkgutil="${libdir}/python2.6/pkgutil.* " +FILES_${PN}-pkgutil="${libdir}/python2.7/pkgutil.* " DESCRIPTION_${PN}-pprint="Python Pretty-Print Support" RDEPENDS_${PN}-pprint="${PN}-core" -FILES_${PN}-pprint="${libdir}/python2.6/pprint.* " +FILES_${PN}-pprint="${libdir}/python2.7/pprint.* " DESCRIPTION_${PN}-profile="Python Basic Profiling Support" RDEPENDS_${PN}-profile="${PN}-core ${PN}-textutils" -FILES_${PN}-profile="${libdir}/python2.6/profile.* ${libdir}/python2.6/pstats.* ${libdir}/python2.6/cProfile.* ${libdir}/python2.6/lib-dynload/_lsprof.so " +FILES_${PN}-profile="${libdir}/python2.7/profile.* ${libdir}/python2.7/pstats.* ${libdir}/python2.7/cProfile.* ${libdir}/python2.7/lib-dynload/_lsprof.so " DESCRIPTION_${PN}-pydoc="Python Interactive Help Support" RDEPENDS_${PN}-pydoc="${PN}-core ${PN}-lang ${PN}-stringold ${PN}-re" -FILES_${PN}-pydoc="${bindir}/pydoc ${libdir}/python2.6/pydoc.* " +FILES_${PN}-pydoc="${bindir}/pydoc ${libdir}/python2.7/pydoc.* " DESCRIPTION_${PN}-re="Python Regular Expression APIs" RDEPENDS_${PN}-re="${PN}-core" -FILES_${PN}-re="${libdir}/python2.6/re.* ${libdir}/python2.6/sre.* ${libdir}/python2.6/sre_compile.* ${libdir}/python2.6/sre_constants* ${libdir}/python2.6/sre_parse.* " +FILES_${PN}-re="${libdir}/python2.7/re.* ${libdir}/python2.7/sre.* ${libdir}/python2.7/sre_compile.* ${libdir}/python2.7/sre_constants* ${libdir}/python2.7/sre_parse.* " DESCRIPTION_${PN}-readline="Python Readline Support" RDEPENDS_${PN}-readline="${PN}-core" -FILES_${PN}-readline="${libdir}/python2.6/lib-dynload/readline.so ${libdir}/python2.6/rlcompleter.* " +FILES_${PN}-readline="${libdir}/python2.7/lib-dynload/readline.so ${libdir}/python2.7/rlcompleter.* " DESCRIPTION_${PN}-resource="Python Resource Control Interface" RDEPENDS_${PN}-resource="${PN}-core" -FILES_${PN}-resource="${libdir}/python2.6/lib-dynload/resource.so " +FILES_${PN}-resource="${libdir}/python2.7/lib-dynload/resource.so " DESCRIPTION_${PN}-robotparser="Python robots.txt parser" RDEPENDS_${PN}-robotparser="${PN}-core ${PN}-netclient" -FILES_${PN}-robotparser="${libdir}/python2.6/robotparser.* " +FILES_${PN}-robotparser="${libdir}/python2.7/robotparser.* " DESCRIPTION_${PN}-shell="Python Shell-Like Functionality" RDEPENDS_${PN}-shell="${PN}-core ${PN}-re" -FILES_${PN}-shell="${libdir}/python2.6/cmd.* ${libdir}/python2.6/commands.* ${libdir}/python2.6/dircache.* ${libdir}/python2.6/fnmatch.* ${libdir}/python2.6/glob.* ${libdir}/python2.6/popen2.* ${libdir}/python2.6/shlex.* ${libdir}/python2.6/shutil.* " +FILES_${PN}-shell="${libdir}/python2.7/cmd.* ${libdir}/python2.7/commands.* ${libdir}/python2.7/dircache.* ${libdir}/python2.7/fnmatch.* ${libdir}/python2.7/glob.* ${libdir}/python2.7/popen2.* ${libdir}/python2.7/shlex.* ${libdir}/python2.7/shutil.* " DESCRIPTION_${PN}-smtpd="Python Simple Mail Transport Daemon" RDEPENDS_${PN}-smtpd="${PN}-core ${PN}-netserver ${PN}-email ${PN}-mime"
@@ -203,63 +203,63 @@ FILES_${PN}-smtpd="${bindir}/smtpd.* " DESCRIPTION_${PN}-sqlite3="Python Sqlite3 Database Support" RDEPENDS_${PN}-sqlite3="${PN}-core ${PN}-datetime ${PN}-lang ${PN}-crypt ${PN}-io ${PN}-threading ${PN}-zlib" -FILES_${PN}-sqlite3="${libdir}/python2.6/lib-dynload/_sqlite3.so ${libdir}/python2.6/sqlite3/dbapi2.* ${libdir}/python2.6/sqlite3/__init__.* ${libdir}/python2.6/sqlite3/dump.* " +FILES_${PN}-sqlite3="${libdir}/python2.7/lib-dynload/_sqlite3.so ${libdir}/python2.7/sqlite3/dbapi2.* ${libdir}/python2.7/sqlite3/__init__.* ${libdir}/python2.7/sqlite3/dump.* " DESCRIPTION_${PN}-sqlite3-tests="Python Sqlite3 Database Support Tests" RDEPENDS_${PN}-sqlite3-tests="${PN}-core ${PN}-sqlite3" -FILES_${PN}-sqlite3-tests="${libdir}/python2.6/sqlite3/test " +FILES_${PN}-sqlite3-tests="${libdir}/python2.7/sqlite3/test " DESCRIPTION_${PN}-stringold="Python String APIs [deprecated]" RDEPENDS_${PN}-stringold="${PN}-core ${PN}-re" -FILES_${PN}-stringold="${libdir}/python2.6/lib-dynload/strop.so ${libdir}/python2.6/string.* " +FILES_${PN}-stringold="${libdir}/python2.7/lib-dynload/strop.so ${libdir}/python2.7/string.* " DESCRIPTION_${PN}-subprocess="Python Subprocess Support" RDEPENDS_${PN}-subprocess="${PN}-core ${PN}-io ${PN}-re ${PN}-fcntl ${PN}-pickle" -FILES_${PN}-subprocess="${libdir}/python2.6/subprocess.* " +FILES_${PN}-subprocess="${libdir}/python2.7/subprocess.* " DESCRIPTION_${PN}-syslog="Python Syslog Interface" RDEPENDS_${PN}-syslog="${PN}-core" -FILES_${PN}-syslog="${libdir}/python2.6/lib-dynload/syslog.so " +FILES_${PN}-syslog="${libdir}/python2.7/lib-dynload/syslog.so " DESCRIPTION_${PN}-terminal="Python Terminal Controlling Support" RDEPENDS_${PN}-terminal="${PN}-core ${PN}-io" -FILES_${PN}-terminal="${libdir}/python2.6/pty.* ${libdir}/python2.6/tty.* " +FILES_${PN}-terminal="${libdir}/python2.7/pty.* ${libdir}/python2.7/tty.* " DESCRIPTION_${PN}-tests="Python Tests" RDEPENDS_${PN}-tests="${PN}-core" -FILES_${PN}-tests="${libdir}/python2.6/test " +FILES_${PN}-tests="${libdir}/python2.7/test " DESCRIPTION_${PN}-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support" RDEPENDS_${PN}-textutils="${PN}-core ${PN}-io ${PN}-re ${PN}-stringold" -FILES_${PN}-textutils="${libdir}/python2.6/lib-dynload/_csv.so ${libdir}/python2.6/csv.* ${libdir}/python2.6/optparse.* ${libdir}/python2.6/textwrap.* " +FILES_${PN}-textutils="${libdir}/python2.7/lib-dynload/_csv.so ${libdir}/python2.7/csv.* ${libdir}/python2.7/optparse.* ${libdir}/python2.7/textwrap.* " DESCRIPTION_${PN}-threading="Python Threading & Synchronization Support" RDEPENDS_${PN}-threading="${PN}-core ${PN}-lang" -FILES_${PN}-threading="${libdir}/python2.6/_threading_local.* ${libdir}/python2.6/dummy_thread.* ${libdir}/python2.6/dummy_threading.* ${libdir}/python2.6/mutex.* ${libdir}/python2.6/threading.* ${libdir}/python2.6/Queue.* " +FILES_${PN}-threading="${libdir}/python2.7/_threading_local.* ${libdir}/python2.7/dummy_thread.* ${libdir}/python2.7/dummy_threading.* ${libdir}/python2.7/mutex.* ${libdir}/python2.7/threading.* ${libdir}/python2.7/Queue.* " DESCRIPTION_${PN}-tkinter="Python Tcl/Tk Bindings" RDEPENDS_${PN}-tkinter="${PN}-core" -FILES_${PN}-tkinter="${libdir}/python2.6/lib-dynload/_tkinter.so ${libdir}/python2.6/lib-tk " +FILES_${PN}-tkinter="${libdir}/python2.7/lib-dynload/_tkinter.so ${libdir}/python2.7/lib-tk " DESCRIPTION_${PN}-unittest="Python Unit Testing Framework" RDEPENDS_${PN}-unittest="${PN}-core ${PN}-stringold ${PN}-lang" -FILES_${PN}-unittest="${libdir}/python2.6/unittest.* " +FILES_${PN}-unittest="${libdir}/python2.7/unittest.* " DESCRIPTION_${PN}-unixadmin="Python Unix Administration Support" RDEPENDS_${PN}-unixadmin="${PN}-core" -FILES_${PN}-unixadmin="${libdir}/python2.6/lib-dynload/nis.so ${libdir}/python2.6/lib-dynload/grp.so ${libdir}/python2.6/lib-dynload/pwd.so ${libdir}/python2.6/getpass.* " +FILES_${PN}-unixadmin="${libdir}/python2.7/lib-dynload/nis.so ${libdir}/python2.7/lib-dynload/grp.so ${libdir}/python2.7/lib-dynload/pwd.so ${libdir}/python2.7/getpass.* " DESCRIPTION_${PN}-xml="Python basic XML support." RDEPENDS_${PN}-xml="${PN}-core ${PN}-elementtree ${PN}-re" -FILES_${PN}-xml="${libdir}/python2.6/lib-dynload/pyexpat.so ${libdir}/python2.6/xml ${libdir}/python2.6/xmllib.* " +FILES_${PN}-xml="${libdir}/python2.7/lib-dynload/pyexpat.so ${libdir}/python2.7/xml ${libdir}/python2.7/xmllib.* " DESCRIPTION_${PN}-xmlrpc="Python XMLRPC Support" RDEPENDS_${PN}-xmlrpc="${PN}-core ${PN}-xml ${PN}-netserver ${PN}-lang" -FILES_${PN}-xmlrpc="${libdir}/python2.6/xmlrpclib.* ${libdir}/python2.6/SimpleXMLRPCServer.* " +FILES_${PN}-xmlrpc="${libdir}/python2.7/xmlrpclib.* ${libdir}/python2.7/SimpleXMLRPCServer.* " DESCRIPTION_${PN}-zlib="Python zlib Support." RDEPENDS_${PN}-zlib="${PN}-core" -FILES_${PN}-zlib="${libdir}/python2.6/lib-dynload/zlib.so " +FILES_${PN}-zlib="${libdir}/python2.7/lib-dynload/zlib.so " DESCRIPTION_${PN}-modules="All Python modules" RDEPENDS_${PN}-modules="${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-difflib ${PN}-distutils ${PN}-doctest ${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle ${PN}-image ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib "
scripts/contrib/python/generate-manifest-2.7.py renamed from scripts/contrib/python/generate-manifest-2.6.py +1 -1
@@ -14,7 +14,7 @@ import os import sys import time -VERSION = "2.6.6" +VERSION = "2.7.2" __author__ = "Michael 'Mickey' Lauer <[email protected]>" __version__ = "20110222.1"
Signature · 1 line
1.7.6.1
Re: [PATCH 4/4] python, python-native: upgrade from 2.6.6 to 2.7.2
In reply to Martin JansaQuoted 17 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Martin Jansa
Sent: Friday, September 30, 2011 11:38 AM
To: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH 4/4] python, python-native: upgrade from 2.6.6 to 2.7.2Quoted 4 lines · On Thu, Sep 29, 2011 at 06:27:11PM -0700, [email protected] wrote:
From: Nitin A Kamble <[email protected]>
rename from meta/recipes-devtools/python/python-2.6-manifest.inc rename to meta/recipes-devtools/python/python-2.7-manifest.inc
Quoted 6 lines
this is wrong.. just to rename it isn't enough
I will send patch which regenerates manifest with right paths to actually package something..
Regards,
Hi Martin,
Thanks for catching this. I did not see issue with old manifest. But getting new manifest would be better.
Thanks,
Nitin
Re: [PATCH 4/4] python, python-native: upgrade from 2.6.6 to 2.7.2
Quoted 19 lines · Nitin A
Quoted 19 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Martin Jansa
Sent: Friday, September 30, 2011 11:38 AM
To: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH 4/4] python, python-native: upgrade from 2.6.6 to 2.7.2Quoted 4 lines · On Thu, Sep 29, 2011 at 06:27:11PM -0700, [email protected] wrote:
From: Nitin A Kamble <[email protected]>
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
Quoted 7 lines
Quoted 4 lines
I will send patch which regenerates manifest with right paths to actually package something..
Regards,
Hi Martin,
Thanks for catching this. I did not see issue with old manifest. But getting new manifest would be better.
Maybe you had python2.6 packages still arround, but for me the issue looked like this (because almost all python-* packages were skipped as empty)
-FILES_${PN}-foo="${libdir}/python2.6/foo" +FILES_${PN}-foo="${libdir}/python2.7/foo"
| Collected errors:
| * satisfy_dependencies_for: Cannot satisfy the following dependencies for task-shr-minimal-fso:
| * python-textutils * python-multiprocessing *
python-shell * python-syslog * python-threading *
python-xml * python-io * python-logging * python-stringold *
python-ctypes * python-difflib * python-datetime * python-logging * python-textutils * python-sqlite3 * python-subprocess * python-io * python-fcntl * python-stringold * python-pprint * python-shell * python-datetime * * python-codecs * | * opkg_install_cmd: Cannot install package task-shr-minimal-fso. | * satisfy_dependencies_for: Cannot satisfy the following dependencies for task-shr-minimal-gtk: | * libpoppler5 (>= 0.12.3) * libpoppler5 (>= 0.12.3) * libpoppler5 (>= 0.12.3) * | * opkg_install_cmd: Cannot install package task-shr-minimal-gtk. | * satisfy_dependencies_for: Cannot satisfy the following dependencies for task-shr-minimal-apps: | * python-resource * python-io * python-terminal * python-fcntl * python-shell * python-lang * python-lang * python-lang * python-lang * python-codecs * python-lang * libpoppler5 (>= 0.12.3) * | * opkg_install_cmd: Cannot install package task-shr-minimal-apps. | * satisfy_dependencies_for: Cannot satisfy the following dependencies for task-shr-cli: | * python-compression * python-netclient * python-textutils * python-image * python-mime * python-json * python-html * * python-sqlite3 * python-netclient * python-sqlite3 * * python-netclient *
| * opkg_install_cmd: Cannot install package task-shr-cli.
| ERROR: Function 'do_rootfs' failed (see /OE/shr-core/tmp/work/om_gta02-oe-linux-gnueabi/shr-image-2.0-r18/temp/log.do_rootfs.13435 for further information)
NOTE: package shr-image-2.0-r18: task do_rootfs: Failed
ERROR: Task 8 (/OE/shr-core/meta-smartphone/meta-shr/recipes-shr/images/shr-image.bb, do_rootfs) failed with exit code '1'
ERROR:
'/OE/shr-core/meta-smartphone/meta-shr/recipes-shr/images/shr-image.bb' failed
Quoted 8 lines
Thanks,
Nitin_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [PATCH 4/4] python, python-native: upgrade from 2.6.6 to 2.7.2
Quoted 68 lines · Martin Jansa
Quoted 19 lines · Nitin A
Quoted 19 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Martin Jansa
Sent: Friday, September 30, 2011 11:38 AM
To: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH 4/4] python, python-native: upgrade from 2.6.6 to 2.7.2Quoted 4 lines · On Thu, Sep 29, 2011 at 06:27:11PM -0700, [email protected] wrote:
From: Nitin A Kamble <[email protected]>
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
Quoted 7 lines
Quoted 4 lines
I will send patch which regenerates manifest with right paths to actually package something..
Regards,
Hi Martin,
Thanks for catching this. I did not see issue with old manifest. But getting new manifest would be better.Maybe you had python2.6 packages still arround, but for me the issue looked like this (because almost all python-* packages were skipped as empty)
(quoted diff) +1
-1-FILES_${PN}-foo="${libdir}/python2.6/foo" +FILES_${PN}-foo="${libdir}/python2.7/foo"| Collected errors:
| *satisfy_dependencies_for: Cannot satisfy the following dependencies for task-shr-minimal-fso:
| * python-textutils * python-multiprocessing *
python-shell * python-syslog * python-threading *
python-xml * python-io * python-logging * python-stringold * python-ctypes * python-difflib * python-datetime * python-logging * python-textutils * python-sqlite3 * python-subprocess * python-io * python-fcntl * python-stringold
* python-pprint * python-shell * python-datetime *
* python-codecs *
| *opkg_install_cmd: Cannot install package task-shr-minimal-fso.
| *satisfy_dependencies_for: Cannot satisfy the following dependencies for task-shr-minimal-gtk:
| * libpoppler5 (>= 0.12.3) * libpoppler5 (>= 0.12.3) * libpoppler5 (>= 0.12.3) *
| *opkg_install_cmd: Cannot install package task-shr-minimal-gtk.
| *satisfy_dependencies_for: Cannot satisfy the following dependencies for task-shr-minimal-apps:
| * python-resource * python-io * python-terminal * python-fcntl * python-shell * python-lang * python-lang *
python-lang * python-lang * python-codecs *
python-lang * libpoppler5 (>= 0.12.3) *
| *opkg_install_cmd: Cannot install package task-shr-minimal-apps.
| *satisfy_dependencies_for: Cannot satisfy the following dependencies for task-shr-cli:
| * python-compression * python-netclient * python-textutils
* python-image * python-mime * python-json * python-html *
* python-sqlite3 * python-netclient * python-sqlite3 *
* python-netclient *
| *opkg_install_cmd: Cannot install package task-shr-cli.
| ERROR: Function 'do_rootfs' failed (see /OE/shr-core/tmp/work/om_gta02-oe-linux-gnueabi/shr-image-2.0-r18/temp/log.do_rootfs.13435
Quoted 8 lines
for further information)
NOTE: package shr-image-2.0-r18: taskdo_rootfs: Failed
ERROR: Task 8 (/OE/shr-core/meta-smartphone/meta-shr/recipes-shr/images/shr-image.bb,do_rootfs) failed with exit code '1'
ERROR:
'/OE/shr-core/meta-smartphone/meta-shr/recipes-shr/images/shr-image.bb' failed
Even with right manifest few modules which were built fine before are failing now
At least
python-syslog
python-elementtree
python-zlib
python-fcntl
python-resource
should be built and maybe they are failing because of:
/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/python-2.7.2-r0.0/Python-2.7.2/Modules/_ctypes/cfield.c:
In function 'PyCField_FromDesc':
/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/python-2.7.2-r0.0/Python-2.7.2/Modules/_ctypes/cfield.c:50:29:
warning: variable 'length' set but not u
sed [-Wunused-but-set-variable] /OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/python-2.7.2-r0.0/Python-2.7.2/Modules/_ctypes/libffi/src/dlmalloc.c:
In function 'mmap_resize':
/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/python-2.7.2-r0.0/Python-2.7.2/Modules/_ctypes/libffi/src/dlmalloc.c:3193:5:
warning: implicit declarat
ion of function 'mremap' [-Wimplicit-function-declaration] /OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/python-2.7.2-r0.0/Python-2.7.2/Modules/_ctypes/libffi/src/dlmalloc.c:
In function 'sys_trim':
/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/python-2.7.2-r0.0/Python-2.7.2/Modules/_ctypes/libffi/src/dlmalloc.c:3612:62:
warning: comparison betwe
en pointer and integer [enabled by default]
"../temp/log.do_compile" [converted] 651L, 90722C
549,1 86%
/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/python-2.7.2-r0.0/Python-2.7.2/Modules/_ctypes/libffi/src/dlmalloc.c:
In function 'sys_trim':
/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/python-2.7.2-r0.0/Python-2.7.2/Modules/_ctypes/libffi/src/dlmalloc.c:3612:62:
warning: comparison betwe
en pointer and integer [enabled by default] /OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/python-2.7.2-r0.0/Python-2.7.2/Modules/_ctypes/libffi/src/arm/ffi.c:204:1:
warning: function declaratio
n isn't a prototype [-Wstrict-prototypes]
/OE/shr-core/tmp/sysroots/x86_64-linux/usr/lib/libpython2.7.so: file
not recognized: File format not recognized
collect2: ld returned 1 exit status
Looking in readline for ['/OE/shr-core/tmp/sysroots/nokia900/usr/lib']
where
$ file /OE/shr-core/tmp/sysroots/x86_64-linux/usr/lib/libpython2.7.so /OE/shr-core/tmp/sysroots/x86_64-linux/usr/lib/libpython2.7.so: symbolic link to `libpython2.7.so.1.0'
$ file /OE/shr-core/tmp/sysroots/x86_64-linux/usr/lib/libpython2.7.so.1.0 /OE/shr-core/tmp/sysroots/x86_64-linux/usr/lib/libpython2.7.so.1.0: ELF 64-bit LSB shared object, x86-64, version 1 (SYSV), dynamically linked, not stripped
more modules are failing but at least those listed above were building fine with 2.6, can you check it please?
Python build finished, but the necessary bits to build these modules were not found:
_bsddb _tkinter bsddb185 dbm dl imageop linuxaudiodev ossaudiodev sunaudiodev
To find the necessary bits, look in setup.py in detect_modules() for the module's name.
Failed to build these modules:
_bisect _codecs_cn _codecs_hk _codecs_iso2022 _codecs_jp _codecs_kr _codecs_tw _collections _csv _ctypes _ctypes_test _curses _curses_panel _elementtree _functools _hashlib _heapq _hotshot _io _json _locale _lsprof _multibytecodec _multiprocessing _random _socket _sqlite3 _ssl _struct _testcapi array audioop binascii bz2 cmath cPickle crypt cStringIO datetime fcntl future_builtins gdbm grp itertools math mmap nis operator parser pyexpat readline resource select spwd strop syslog termios time unicodedata zlib
Regards,
Re: [PATCH 4/4] python, python-native: upgrade from 2.6.6 to 2.7.2
Hi Martin,
Ok, I will reproduce it with your manifest patch and look into fixing it.
Thanks & Regards,
Nitin
Quoted 199 lines
-----Original Message-----
From: Martin Jansa [mailto:[email protected]]
Sent: Saturday, October 01, 2011 11:34 AM
To: Patches and discussions about the oe-core layer
Cc: Kamble, Nitin A
Subject: Re: [OE-core] [PATCH 4/4] python, python-native: upgrade from 2.6.6 to 2.7.2Quoted 5 lines · Martin Jansa
Quoted 4 lines · Nitin A
Quoted 4 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] OnBehalf Of
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Martin Jansa
Sent: Friday, September 30, 2011 11:38 AM
To: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH 4/4] python, python-native: upgradefrom
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
2.6.6 to 2.7.2
Quoted 4 lines · On Thu, Sep 29, 2011 at 06:27:11PM -0700, [email protected] wrote:
From: Nitin A Kamble <[email protected]>
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
Quoted 7 lines
Quoted 7 lines
Quoted 4 lines
I will send patch which regenerates manifest with right paths to actually package something..
Regards,
Hi Martin,
Thanks for catching this. I did not see issue with old manifest.But getting new manifest would be better.
Quoted 3 lines
Maybe you had python2.6 packages still arround, but for me the issue looked like this (because almost all python-* packages were skipped
as
Quoted 7 lines
empty)
(quoted diff) +1
-1-FILES_${PN}-foo="${libdir}/python2.6/foo" +FILES_${PN}-foo="${libdir}/python2.7/foo"| Collected errors:
| *satisfy_dependencies_for: Cannot satisfy the followingdependencies
Quoted 4 lines
for task-shr-minimal-fso:
| * python-textutils * python-multiprocessing * python-shell * python-syslog * python-threading * python-xml * python-io * python-logging * python-stringold *
Quoted 3 lines
python-ctypes * python-difflib * python-datetime * python-logging * python-textutils * python-sqlite3 * python-subprocess * python-io * python-fcntl * python-
stringold
Quoted 4 lines
* python-pprint * python-shell * python-datetime *
* python-codecs *
| *opkg_install_cmd: Cannot install package task-shr-minimal-fso. | *satisfy_dependencies_for: Cannot satisfy the followingdependencies
Quoted 5 lines
for task-shr-minimal-gtk:
| * libpoppler5 (>= 0.12.3) * libpoppler5 (>= 0.12.3) * libpoppler5 (>= 0.12.3) *
| *opkg_install_cmd: Cannot install package task-shr-minimal-gtk. | *satisfy_dependencies_for: Cannot satisfy the followingdependencies
Quoted 7 lines
for task-shr-minimal-apps:
| * python-resource * python-io * python-terminal * python-fcntl * python-shell * python-lang * python-lang * python-lang * python-lang * python-codecs * python-lang * libpoppler5 (>= 0.12.3) *
| *opkg_install_cmd: Cannot install package task-shr-minimal-apps. | *satisfy_dependencies_for: Cannot satisfy the followingdependencies
Quoted 2 lines
for task-shr-cli:
| * python-compression * python-netclient * python-textutils
Quoted 6 lines
* python-image * python-mime * python-json * python-html *
* python-sqlite3 * python-netclient * python-sqlite3 *
* python-netclient *
| *opkg_install_cmd: Cannot install package task-shr-cli. | ERROR: Function 'do_rootfs' failed (see /OE/shr-core/tmp/work/om_gta02-oe-linux-gnueabi/shr-image-2.0-r18/temp/log.do_rootfs.13435
Quoted 4 lines
for further information)
NOTE: package shr-image-2.0-r18: taskdo_rootfs: Failed
ERROR: Task 8 (/OE/shr-core/meta-smartphone/meta-shr/recipes-shr/images/shr-image.bb,
Quoted 3 lines
do_rootfs) failed with exit code '1'
ERROR:
'/OE/shr-core/meta-smartphone/meta-shr/recipes-shr/images/shr-image.bb'
Quoted 1 line
failed
Even with right manifest few modules which were built fine before are failing now
At least
python-syslog
python-elementtree
python-zlib
python-fcntl
python-resourceshould be built and maybe they are failing because of:
/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/python-2.7.2-r0.0/Python-2.7.2/Modules/_ctypes/cfield.c:
In function 'PyCField_FromDesc':
/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/python-2.7.2-r0.0/Python-2.7.2/Modules/_ctypes/cfield.c:50:29:
warning: variable 'length' set but not u
sed [-Wunused-but-set-variable] /OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/python-2.7.2-r0.0/Python-2.7.2/Modules/_ctypes/libffi/src/dlmalloc.c:
In function 'mmap_resize':
/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/python-2.7.2-r0.0/Python-2.7.2/Modules/_ctypes/libffi/src/dlmalloc.c:3193:5:
warning: implicit declarat
ion of function 'mremap' [-Wimplicit-function-declaration] /OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/python-2.7.2-r0.0/Python-2.7.2/Modules/_ctypes/libffi/src/dlmalloc.c:
In function 'sys_trim':
/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/python-2.7.2-r0.0/Python-2.7.2/Modules/_ctypes/libffi/src/dlmalloc.c:3612:62:
warning: comparison betwe
en pointer and integer [enabled by default] "../temp/log.do_compile" [converted] 651L, 90722C549,1 86%
/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/python-2.7.2-r0.0/Python-2.7.2/Modules/_ctypes/libffi/src/dlmalloc.c:
In function 'sys_trim':
/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/python-2.7.2-r0.0/Python-2.7.2/Modules/_ctypes/libffi/src/dlmalloc.c:3612:62:
warning: comparison betwe
en pointer and integer [enabled by default] /OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/python-2.7.2-r0.0/Python-2.7.2/Modules/_ctypes/libffi/src/arm/ffi.c:204:1:
warning: function declaratio
n isn't a prototype [-Wstrict-prototypes] /OE/shr-core/tmp/sysroots/x86_64-linux/usr/lib/libpython2.7.so: file not recognized: File format not recognized
collect2: ld returned 1 exit status
Looking in readline for ['/OE/shr-core/tmp/sysroots/nokia900/usr/lib']where
$ file /OE/shr-core/tmp/sysroots/x86_64-linux/usr/lib/libpython2.7.so /OE/shr-core/tmp/sysroots/x86_64-linux/usr/lib/libpython2.7.so: symbolic link to `libpython2.7.so.1.0'$ file /OE/shr-core/tmp/sysroots/x86_64- linux/usr/lib/libpython2.7.so.1.0 /OE/shr-core/tmp/sysroots/x86_64-linux/usr/lib/libpython2.7.so.1.0: ELF 64-bit LSB shared object, x86-64, version 1 (SYSV), dynamically linked, not strippedmore modules are failing but at least those listed above were building fine with 2.6, can you check it please?
Python build finished, but the necessary bits to build these modules were not found:
_bsddb _tkinter bsddb185 dbm dl imageop linuxaudiodev ossaudiodev sunaudiodevTo find the necessary bits, look in
setup.pyindetect_modules()for the module's name.Failed to build these modules:
_bisect _codecs_cn _codecs_hk _codecs_iso2022 _codecs_jp _codecs_kr _codecs_tw _collections _csv _ctypes _ctypes_test _curses _curses_panel _elementtree _functools _hashlib _heapq _hotshot _io _json _locale _lsprof _multibytecodec _multiprocessing _random _socket _sqlite3 _ssl _struct _testcapi array audioop binascii bz2 cmath cPickle crypt cStringIO datetime fcntl future_builtins gdbm grp itertools math mmap nis operator parser pyexpat readline resource select spwd strop syslog termios time unicodedata zlibRegards,
Re: [PATCH 4/4] python, python-native: upgrade from 2.6.6 to 2.7.2
In reply to Martin JansaMartin,
I am fixing the python 2.7.2 recipe, and I need to update the generate-manifest-2.7.py script slightly, to get more files included in the python-core package.
BTW how to run this script ? some documentation of it in the script would be useful.
Thanks,
Nitin
Re: [PATCH 4/4] python, python-native: upgrade from 2.6.6 to 2.7.2
Quoted 2 lines · Nitin A
Martin,
I am fixing the python 2.7.2 recipe, and I need to update thegenerate-manifest-2.7.pyscript slightly, to get more files included in the python-core package.
great, I was debuging it a bit more today and found out that the problem
seems to be in python-native, because with python-native-2.7.2 when I
try to build old python-2.6.6 it's also tring to link extra modules to
-native libpython2.7 and fails:
/OE/shr-core/tmp/sysroots/x86_64-linux/usr/lib/libpython2.7.so: file not recognized: File format not recognized
but even after comparing sysroots/builddirs/logs from 2.6.6 and 2.7.2 I still don't see why it picked right libpython2.6 before and now it fails. I've tried it without multilib support and partially reverted changes in patches from 2.6.6 and still it fails :/
btw: there seems to be also issue in runtime SHR root@gjama ~ $ python -v
Could not find platform independent libraries <prefix> Consider setting $PYTHONHOME to <prefix>[:<exec_prefix>]
# installing zipimport hook import zipimport # builtin # installed zipimport hook ImportError: No module named site # clear __builtin__._ # clear sys.path # clear sys.argv # clear sys.ps1 # clear sys.ps2 # clear sys.exitfunc # clear sys.exc_type # clear sys.exc_value # clear sys.exc_traceback # clear sys.last_type # clear sys.last_value # clear sys.last_traceback # clear sys.path_hooks # clear sys.path_importer_cache # clear sys.meta_path # clear sys.flags # clear sys.float_info # restore sys.stdin # restore sys.stdout # restore sys.stderr # cleanup __main__ # cleanup[1] zipimport # cleanup[1] signal # cleanup[1] exceptions # cleanup[1] _warnings # cleanup sys # cleanup __builtin__ # cleanup ints: 5 unfreed ints # cleanup floats
Quoted 1 line
BTW how to run this script ? some documentation of it in the script would be useful.
just execute it and it prints manifest, so something like this:
openembedded-core $ scripts/contrib/python/generate-manifest-2.7.py > meta/recipes-devtools/python/python-2.7-manifest.inc
Regards,
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [PATCH 4/4] python, python-native: upgrade from 2.6.6 to 2.7.2
Quoted 64 lines
-----Original Message-----
From: Martin Jansa [mailto:[email protected]]
Sent: Thursday, October 13, 2011 2:41 PM
To: Kamble, Nitin A
Cc: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH 4/4] python, python-native: upgrade from 2.6.6 to 2.7.2Quoted 2 lines · Nitin A
Martin,
I am fixing the python 2.7.2 recipe, and I need to update the
generate-manifest-2.7.pyscript slightly, to get more files included in the python-core package.great, I was debuging it a bit more today and found out that the problem seems to be in python-native, because with python-native-2.7.2 when I try to build old python-2.6.6 it's also tring to link extra modules to -native libpython2.7 and fails:
/OE/shr-core/tmp/sysroots/x86_64-linux/usr/lib/libpython2.7.so: file not recognized: File format not recognizedbut even after comparing sysroots/builddirs/logs from 2.6.6 and 2.7.2 I still don't see why it picked right libpython2.6 before and now it fails.
I've tried it without multilib support and partially reverted changes in patches from 2.6.6 and still it fails :/btw: there seems to be also issue in runtime SHR root@gjama ~ $ python -v Could not find platform independent libraries <prefix> Consider setting $PYTHONHOME to <prefix>[:<exec_prefix>] # installing zipimport hook import zipimport # builtin # installed zipimport hook
ImportError: No module named site# clear __builtin__._ # clear sys.path # clear sys.argv # clear sys.ps1 # clear sys.ps2 # clear sys.exitfunc # clear sys.exc_type # clear sys.exc_value # clear sys.exc_traceback # clear sys.last_type # clear sys.last_value # clear sys.last_traceback # clear sys.path_hooks # clear sys.path_importer_cache # clear sys.meta_path # clear sys.flags # clear sys.float_info # restore sys.stdin # restore sys.stdout # restore sys.stderr # cleanup __main__ # cleanup[1] zipimport # cleanup[1] signal # cleanup[1] exceptions # cleanup[1] _warnings # cleanup sys # cleanup __builtin__ # cleanup ints: 5 unfreed ints # cleanup floats
Quoted 2 lines
Quoted 1 line
BTW how to run this script ? some documentation of it in the script
would be useful.
I got python 2.7.2 to work inside the qemux86 machine now. I will send a pull request for review/test today.
Thanks,
Nitin
Quoted 8 lines
just execute it and it prints manifest, so something like this:
openembedded-core $scripts/contrib/python/generate-manifest-2.7.py> meta/recipes-devtools/python/python-2.7-manifest.incRegards,
--
Martin 'JaMa' Jansa jabber: [email protected]
Re: [PATCH 4/4] python, python-native: upgrade from 2.6.6 to 2.7.2
In reply to Martin JansaOp 30 sep. 2011 om 13:37 heeft Martin Jansa <[email protected]> het volgende geschreven:
Quoted 64 lines · On Thu, Sep 29, 2011 at 06:27:11PM -0700, [email protected] wrote:
Quoted 63 lines
From: Nitin A Kamble <[email protected]>
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.patchDeleted these patches are the are now upstream
deleted:python/02-remove-test-for-cross.patch
deleted:python/security_issue_2254_fix.patchAdded this patch to python-native
new file:python-native/multilib.patchUpdated site config files for python
modified: ../../site/arm-common
modified: ../../site/mips-commonUpdated default python version
modified: ../../conf/distro/include/default-versions.incSigned-off-by Nitin A Kamble <[email protected]>---
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.patchrename meta/recipes-devtools/python/{python-native_2.6.6.bb => python-native_2.7.2.bb} (74%) delete mode 100644meta/recipes-devtools/python/python/02-remove-test-for-cross.patchdelete mode 100644meta/recipes-devtools/python/python/security_issue_2254_fix.patchrename meta/recipes-devtools/python/{python_2.6.6.bb => python_2.7.2.bb} (92%)meta/conf/distro/include/default-versions.inc +0
-0@@ -4,9 +4,9 @@
PREFERRED_VERSION_pulseaudio?= "0.9.23"# Force the python versions in one place
meta/conf/distro/include/default-versions.inc +3
-3-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"
Quoted 8 lines
meta/recipes-devtools/python/python-2.7-manifest.inc
Quoted 6 lines
# Force the older version of liberation-fonts until we fix the fontforge issue PREFERRED_VERSION_liberation-fonts ?= "1.04"
meta/recipes-devtools/python/python-2.7-manifest.inc renamed from meta/recipes-devtools/python/python-2.6-manifest.inc +0
-0this is wrong.. just to rename it isn't enough
It also drops the source checksums :(
Quoted 9 lines
I will send patch which regenerates manifest with right paths to actually package something..
Regards,
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [PATCH 4/4] python, python-native: upgrade from 2.6.6 to 2.7.2
Quoted 77 lines · Koen Kooi
Op 30 sep. 2011 om 13:37 heeft Martin Jansa <[email protected]> het volgende geschreven:
Quoted 64 lines · On Thu, Sep 29, 2011 at 06:27:11PM -0700, [email protected] wrote:
Quoted 63 lines
From: Nitin A Kamble <[email protected]>
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.patchDeleted these patches are the are now upstream
deleted:python/02-remove-test-for-cross.patch
deleted:python/security_issue_2254_fix.patchAdded this patch to python-native
new file:python-native/multilib.patchUpdated site config files for python
modified: ../../site/arm-common
modified: ../../site/mips-commonUpdated default python version
modified: ../../conf/distro/include/default-versions.incSigned-off-by Nitin A Kamble <[email protected]>---
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.patchrename meta/recipes-devtools/python/{python-native_2.6.6.bb => python-native_2.7.2.bb} (74%) delete mode 100644meta/recipes-devtools/python/python/02-remove-test-for-cross.patchdelete mode 100644meta/recipes-devtools/python/python/security_issue_2254_fix.patchrename meta/recipes-devtools/python/{python_2.6.6.bb => python_2.7.2.bb} (92%)meta/conf/distro/include/default-versions.inc +0
-0@@ -4,9 +4,9 @@
PREFERRED_VERSION_pulseaudio?= "0.9.23"# Force the python versions in one place
meta/conf/distro/include/default-versions.inc +3
-3-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"Quoted 8 lines
meta/recipes-devtools/python/python-2.7-manifest.inc
Quoted 6 lines
# Force the older version of liberation-fonts until we fix the fontforge issue PREFERRED_VERSION_liberation-fonts ?= "1.04"
meta/recipes-devtools/python/python-2.7-manifest.inc renamed from meta/recipes-devtools/python/python-2.6-manifest.inc +0
-0this is wrong.. just to rename it isn't enough
Quoted 1 line
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 dropDEFAULT_PREFERENCE = "-27"
as there is only one python version anyways
Regards,
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Quoted 10 lines · On Fri, Sep 30, 2011 at 3:27 AM, <[email protected]> wrote:
From: Nitin A Kamble <[email protected]>
The following changes since commit
9d1db6cc928199f8ac4960e8d4648563ef141427:python: fix sqlite RPATH issue (2011-09-29 16:57:30 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib nitin/upgrades
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/upgrades
Quoted 5 lines
Nitin A Kamble (4):
gdb: upgrade from 7.3a to 7.3.1
byacc: upgrade from 20101229 to 20110908
python-dbus: upgrade from 0.83.2 to 0.84.0 python, python-native: upgrade from 2.6.6 to 2.7.2
Just for record, upgrading python needs few PR bumps for recipes linking to libpython (RDEPENDing on libpython2.6-1.0)
bitbake -c cleansstate python-setuptools python-setuptools-native
python-pyrex python-pyrex-native
In my case:
NOTE: Running task 3 of 18 (ID: 15, /OE/shr-core/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.7.9.bb, do_cleansstate)
NOTE: Running task 5 of 18 (ID: 13, /OE/shr-core/meta-openembedded/meta-oe/recipes-devtools/python/python-pyyaml_svn.bb, do_cleansstate)
NOTE: Running task 7 of 18 (ID: 11, /OE/shr-core/meta-smartphone/meta-fso/recipes-freesmartphone/python/python-pyrtc_git.bb, do_cleansstate)
NOTE: Running task 9 of 18 (ID: 9, /OE/shr-core/openembedded-core/meta/recipes-devtools/python/python-pygobject_2.27.91.bb, do_cleansstate)
NOTE: Running task 10 of 18 (ID: 17, /OE/shr-core/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_2.95.bb, do_cleansstate)
NOTE: Running task 13 of 18 (ID: 7, /OE/shr-core/openembedded-core/meta/recipes-devtools/python/python-pycairo_1.8.10.bb, do_cleansstate)
NOTE: Running task 14 of 18 (ID: 5, /OE/shr-core/meta-openembedded/meta-oe/recipes-devtools/python/python-pyalsaaudio_0.4.bb, do_cleansstate)
NOTE: Running task 17 of 18 (ID: 3, /OE/shr-core/meta-openembedded/meta-oe/recipes-devtools/python/python-phoneutils_git.bb, do_cleansstate)
NOTE: Running task 18 of 18 (ID: 1, /OE/shr-core/meta-openembedded/meta-oe/recipes-devtools/python/python-numeric_24.2.bb, do_cleansstate)
NOTE: Running task 3 of 4 (ID: 1, /OE/shr-core/openembedded-core/meta/recipes-devtools/python/python-pyrex_0.9.9.bb, do_cleansstate)
NOTE: Running task 4 of 4 (ID: 3, /OE/shr-core/openembedded-core/meta/recipes-devtools/python/python-pyrex-native_0.9.9.bb, do_cleansstate)
NOTE: Running task 3 of 4 (ID: 1, /OE/shr-core/meta-openembedded/meta-oe/recipes-devtools/python/python-setuptools_0.6c11.bb, do_cleansstate)
NOTE: Running task 4 of 4 (ID: 3, virtual:native:/OE/shr-core/meta-openembedded/meta-oe/recipes-devtools/python/python-setuptools_0.6c11.bb, do_cleansstate)
Another source of issues are setuptools versions like
http://git.shr-project.org/git/?p=shr-settings.git;a=commit;h=f5d9debad096e35556261401793d39e1b6c39a3f
or pyrex
NOTE: package python-pycairo-1.8.10-r1: task do_package: Started
ERROR: Function 'do_compile' failed (see /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/python-phoneutils-0.0.2+gitr1+8a7c719e0c3f1f8c10f77f17422da02d7177f0dd-r3/temp/log.do_compile.14861 for further information)
ERROR: Logfile of failure stored in:
/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/python-phoneutils-0.0.2+gitr1+8a7c719e0c3f1f8c10f77f17422da02d7177f0dd-r3/temp/log.do_compile.14861 Log data follows:
| + cd /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/python-phoneutils-0.0.2+gitr1+8a7c719e0c3f1f8c10f77f17422da02d7177f0dd-r3/git/src/python | + do_compile | + setuptools_do_compile | + distutils_do_compile | + STAGING_INCDIR=/OE/shr-core/tmp/sysroots/om-gta02/usr/include | + STAGING_LIBDIR=/OE/shr-core/tmp/sysroots/om-gta02/usr/lib | + BUILD_SYS=x86_64-linux | + HOST_SYS=arm-oe-linux-gnueabi | + /OE/shr-core/tmp/sysroots/x86_64-linux/usr/bin/python setup.py build | You need Pyrex -- http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/ | + bbfatal 'python setup.py build_ext execution failed.' | + echo 'ERROR: python setup.py build_ext execution failed.' | ERROR: python setup.py build_ext execution failed. | + exit 1 | ERROR: Function 'do_compile' failed (see
/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/python-phoneutils-0.0.2+gitr1+8a7c719e0c3f1f8c10f77f17422da02d7177f0dd-r3/temp/log.do_compile.14861 for further information)
And python-cython-0.13 doesn't work with python-2.7 (maybe it needed only PR bump for python-cython-native)
ie python-evas fails with:
| checking for pre-generated ./evas/evas.c_evas.c for ./evas/evas.c_evas.pyx... no
| configure: error: PACKAGING ERROR RELEASE BUILD WITHOUT PRE-GENERATED FILES cython upgrade sent to meta-oe
http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-September/035316.html
And still trying to fix python-pyrtc and python-pyyaml:
| + /OE/shr-core/tmp/sysroots/x86_64-linux/usr/bin/python setup.py build | Traceback (most recent call last): | File "setup.py", line 34, in <module> | from Cython.Distutils import build_ext | File "/OE/shr-core/tmp/sysroots/x86_64-linux/usr/lib/python2.7/site-packages/Cython/Distutils/__init__.py",
line 2, in <module>
| from Cython.Distutils.extension import Extension
| File "/OE/shr-core/tmp/sysroots/x86_64-linux/usr/lib/python2.7/site-packages/Cython/Distutils/extension.py",
line 18, in <module>
| class Extension(_Extension.Extension):
| File "/OE/shr-core/tmp/sysroots/x86_64-linux/usr/lib/python2.7/site-packages/Cython/Distutils/extension.py",
line 39, in Extension
| """ | TypeError: unsupported operand type(s) for +: 'NoneType' and 'str' | + bbfatal 'python setup.py build_ext execution failed.' | + echo 'ERROR: python setup.py build_ext execution failed.'
Regards,
Quoted 6 lines · On 09/29/2011 06:27 PM, [email protected] wrote:
From: Nitin A Kamble<[email protected]>
The following changes since commit
9d1db6cc928199f8ac4960e8d4648563ef141427:python: fix sqlite RPATH issue (2011-09-29 16:57:30 +0100)
Quoted 7 lines
are available in the git repository at:
git://git.pokylinux.org/poky-contribnitin/upgrades
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/upgradesNitin A Kamble (4):
gdb: upgrade from 7.3a to 7.3.1 byacc: upgrade from 20101229 to 20110908
It appears that the above two upgrades were merged into OE-Core
Quoted 3 lines
python-dbus: upgrade from 0.83.2 to 0.84.0 python, python-native: upgrade from 2.6.6 to 2.7.2
Please respin the python* patches set and ensure you look at the other recipes depending on python, ensure a clean build on multiple arches works.
Thanks
Sau!
Quoted 34 lines
meta/conf/distro/include/default-versions.inc | 6 +- meta/recipes-devtools/gdb/gdb-common.inc | 4 +- ...anadian_7.3a.bb => gdb-cross-canadian_7.3.1.bb} | 2 +- .../gdb/{gdb-cross_7.3a.bb => gdb-cross_7.3.1.bb} | 2 +- .../gdb/{gdb_7.3a.bb => gdb_7.3.1.bb} | 2 +- ...on-2.6-manifest.inc => python-2.7-manifest.inc} | 0 ...python-dbus_0.83.2.bb => python-dbus_0.84.0.bb} | 4 +- .../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 +- .../byacc/{byacc_20101229.bb => byacc_20110908.bb} | 4 +- meta/site/arm-common | 3 + meta/site/mips-common | 3 + 21 files changed, 476 insertions(+), 463 deletions(-)rename meta/recipes-devtools/gdb/{gdb-cross-canadian_7.3a.bb => gdb-cross-canadian_7.3.1.bb} (83%) rename meta/recipes-devtools/gdb/{gdb-cross_7.3a.bb => gdb-cross_7.3.1.bb} (78%) rename meta/recipes-devtools/gdb/{gdb_7.3a.bb => gdb_7.3.1.bb} (91%)
rename meta/recipes-devtools/python/{python-2.6-manifest.inc => python-2.7-manifest.inc} (100%) rename meta/recipes-devtools/python/{python-dbus_0.83.2.bb => python-dbus_0.84.0.bb} (83%) create mode 100644meta/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 100644meta/recipes-devtools/python/python/02-remove-test-for-cross.patchdelete mode 100644meta/recipes-devtools/python/python/security_issue_2254_fix.patchrename meta/recipes-devtools/python/{python_2.6.6.bb => python_2.7.2.bb} (92%) rename meta/recipes-extended/byacc/{byacc_20101229.bb => byacc_20110908.bb} (49%)