diff options
| author | Tom Rini <trini@embeddedalley.com> | 2009-04-17 16:24:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@embeddedalley.com> | 2009-04-17 16:24:46 -0400 |
| commit | c8b3cc5ef81d305d5d90644da36acbc40c7c01f1 (patch) | |
| tree | c5780e1ec137dd4cf71d54ba07e41d7795148b75 /recipes/python | |
| parent | 49a720ff8597243a906d7c0f9278ca8f1f9ff670 (diff) | |
| parent | a4f79016c537fc93e5a487d51a22fb4d01e9afe8 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/python')
| -rw-r--r-- | recipes/python/python-2.6.1/05-enable-ctypes-cross-build.patch | 2 | ||||
| -rw-r--r-- | recipes/python/python.inc | 2 | ||||
| -rw-r--r-- | recipes/python/python_2.6.1.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/recipes/python/python-2.6.1/05-enable-ctypes-cross-build.patch b/recipes/python/python-2.6.1/05-enable-ctypes-cross-build.patch index 874b8be01d..58b8078068 100644 --- a/recipes/python/python-2.6.1/05-enable-ctypes-cross-build.patch +++ b/recipes/python/python-2.6.1/05-enable-ctypes-cross-build.patch @@ -22,7 +22,7 @@ Index: Python-2.6.1/setup.py res = os.system(cmd) if res or not os.path.exists(ffi_configfile): - print "Failed to configure _ctypes module" -+ print "Failed to configure _ctypes module (ret=%d) or missing conffile=%s" % ( ret, ffi_configfile ) ++ print "Failed to configure _ctypes module (res=%d) or missing conffile=%s" % ( res, ffi_configfile ) return False fficonfig = {} diff --git a/recipes/python/python.inc b/recipes/python/python.inc index 1e53e6964e..f11345192c 100644 --- a/recipes/python/python.inc +++ b/recipes/python/python.inc @@ -4,7 +4,7 @@ LICENSE = "PSF" SECTION = "devel/python" PRIORITY = "optional" # bump this on every change in contrib/python/generate-manifest-2.6.py -PR = "ml2" +PR = "ml3" DEFAULT_PREFERENCE = "-26" diff --git a/recipes/python/python_2.6.1.bb b/recipes/python/python_2.6.1.bb index 57c64dfa55..e50ca43aab 100644 --- a/recipes/python/python_2.6.1.bb +++ b/recipes/python/python_2.6.1.bb @@ -1,7 +1,7 @@ require python.inc DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl tk zlib" DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" -PR = "ml4" +PR = "ml5" SRC_URI = "\ http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ |