From 7eb235c8a93d0b7a0d043c6f6247a006407e1202 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Sun, 14 Dec 2008 13:59:58 +0100 Subject: python 2.6.1: catch up with packaging changes in 2.6. Python now starts and correctly imports the site file; More tests necessary before we make this the default version. --- contrib/python/generate-manifest-2.6.py | 15 +++++++-------- packages/python/python-2.6-manifest.inc | 6 +++--- packages/python/python.inc | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/contrib/python/generate-manifest-2.6.py b/contrib/python/generate-manifest-2.6.py index 01e4527dcb..b75486f129 100755 --- a/contrib/python/generate-manifest-2.6.py +++ b/contrib/python/generate-manifest-2.6.py @@ -10,10 +10,9 @@ import sys import time VERSION = "2.6.1" -BASEREV = 0 __author__ = "Michael 'Mickey' Lauer " -__version__ = "20081209" +__version__ = "20081214" class MakefileMaker: @@ -153,7 +152,7 @@ if __name__ == "__main__": # m.addPackage( "python-core", "Python Interpreter and core modules (needed!)", "", - "__future__.* copy.* copy_reg.* ConfigParser.* " + + "__future__.* _abcoll.* abc.* copy.* copy_reg.* ConfigParser.* " + "genericpath.* getopt.* linecache.* new.* " + "os.* posixpath.* struct.* " + "warnings.* site.* stat.* " + @@ -243,14 +242,14 @@ if __name__ == "__main__": "colorsys.* imghdr.* lib-dynload/imageop.so lib-dynload/rgbimg.so" ) m.addPackage( "python-io", "Python Low-Level I/O", "python-core python-math", - "lib-dynload/_socket.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so " + "lib-dynload/_socket.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so " + "pipes.* socket.* tempfile.* StringIO.* " ) m.addPackage( "python-lang", "Python Low-Level Language Support", "python-core", - "lib-dynload/array.so lib-dynload/parser.so lib-dynload/operator.so lib-dynload/_weakref.so " + - "lib-dynload/itertools.so lib-dynload/collections.so lib-dynload/_bisect.so lib-dynload/_heapq.so " + - "atexit.* bisect.* code.* codeop.* dis.* heapq.* inspect.* keyword.* opcode.* symbol.* repr.* token.* " + - " tokenize.* traceback.* linecache.* weakref.*" ) + "lib-dynload/_bisect.so lib-dynload/_collections.so lib-dynload/_heapq.so lib-dynload/_weakref.so lib-dynload/_functools.so " + + "lib-dynload/array.so lib-dynload/itertools.so lib-dynload/operator.so lib-dynload/parser.so " + + "atexit.* bisect.* code.* codeop.* collections.* dis.* functools.* heapq.* inspect.* keyword.* opcode.* symbol.* repr.* token.* " + + "tokenize.* traceback.* linecache.* weakref.*" ) m.addPackage( "python-logging", "Python Logging Support", "python-core python-io python-lang python-pickle python-stringold", "logging" ) # package diff --git a/packages/python/python-2.6-manifest.inc b/packages/python/python-2.6-manifest.inc index 3b6a7b7c8f..b8b8d1c27c 100644 --- a/packages/python/python-2.6-manifest.inc +++ b/packages/python/python-2.6-manifest.inc @@ -1,5 +1,5 @@ # WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file. -# Generator: './generate-manifest-2.6.py' Version 20081209 (C) 2002-2008 Michael 'Mickey' Lauer +# Generator: '../org.openembedded.dev/contrib/python/generate-manifest-2.6.py' Version 20081214 (C) 2002-2008 Michael 'Mickey' Lauer # Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy @@ -46,7 +46,7 @@ FILES_python-datetime="${libdir}/python2.6/_strptime.* ${libdir}/python2.6/calen DESCRIPTION_python-core="Python Interpreter and core modules (needed!)" RDEPENDS_python-core="" -FILES_python-core="${libdir}/python2.6/__future__.* ${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.* ${bindir}/python* " +FILES_python-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.* ${bindir}/python* " DESCRIPTION_python-io="Python Low-Level I/O" RDEPENDS_python-io="python-core python-math" @@ -250,7 +250,7 @@ FILES_python-idle="${bindir}/idle ${libdir}/python2.6/idlelib " DESCRIPTION_python-lang="Python Low-Level Language Support" RDEPENDS_python-lang="python-core" -FILES_python-lang="${libdir}/python2.6/lib-dynload/array.so ${libdir}/python2.6/lib-dynload/parser.so ${libdir}/python2.6/lib-dynload/operator.so ${libdir}/python2.6/lib-dynload/_weakref.so ${libdir}/python2.6/lib-dynload/itertools.so ${libdir}/python2.6/lib-dynload/collections.so ${libdir}/python2.6/lib-dynload/_bisect.so ${libdir}/python2.6/lib-dynload/_heapq.so ${libdir}/python2.6/atexit.* ${libdir}/python2.6/bisect.* ${libdir}/python2.6/code.* ${libdir}/python2.6/codeop.* ${libdir}/python2.6/dis.* ${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/linecache.* ${libdir}/python2.6/weakref.* " +FILES_python-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/linecache.* ${libdir}/python2.6/weakref.* " DESCRIPTION_python-audio="Python Audio Handling" RDEPENDS_python-audio="python-core" diff --git a/packages/python/python.inc b/packages/python/python.inc index 9b73e3ff35..1e53e6964e 100644 --- a/packages/python/python.inc +++ b/packages/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 = "ml1" +PR = "ml2" DEFAULT_PREFERENCE = "-26" -- cgit 1.2.3-korg