summaryrefslogtreecommitdiffstats
path: root/meta-extras
diff options
context:
space:
mode:
Diffstat (limited to 'meta-extras')
-rw-r--r--meta-extras/packages/python/python-2.5-manifest.inc148
-rw-r--r--meta-extras/packages/python/python-2.5.2/autohell.patch (renamed from meta-extras/packages/python/python-2.5.1/autohell.patch)25
-rw-r--r--meta-extras/packages/python/python-2.5.2/bindir-libdir.patch (renamed from meta-extras/packages/python/python-2.5.1/bindir-libdir.patch)0
-rw-r--r--meta-extras/packages/python/python-2.5.2/crosscompile.patch (renamed from meta-extras/packages/python/python-2.5.1/crosscompile.patch)28
-rw-r--r--meta-extras/packages/python/python-2.5.2/default-is-optimized.patch (renamed from meta-extras/packages/python/python-2.5.1/default-is-optimized.patch)0
-rw-r--r--meta-extras/packages/python/python-2.5.2/enable-ctypes-module.patch106
-rw-r--r--meta-extras/packages/python/python-2.5.2/fix-tkinter-detection.patch (renamed from meta-extras/packages/python/python-2.5.1/fix-tkinter-detection.patch)0
-rw-r--r--meta-extras/packages/python/python-2.5.2/sitebranding.patch (renamed from meta-extras/packages/python/python-2.5.1/sitebranding.patch)0
-rw-r--r--meta-extras/packages/python/python-2.5.2/sitecustomize.py44
-rw-r--r--meta-extras/packages/python/python-native-2.5.2/bindir-libdir.patch (renamed from meta-extras/packages/python/python-native-2.5.1/bindir-libdir.patch)0
-rw-r--r--meta-extras/packages/python/python-native-2.5.2/cross-distutils.patch (renamed from meta-extras/packages/python/python-native-2.5.1/cross-distutils.patch)0
-rw-r--r--meta-extras/packages/python/python-native-2.5.2/default-is-optimized.patch (renamed from meta-extras/packages/python/python-native-2.5.1/default-is-optimized.patch)0
-rw-r--r--meta-extras/packages/python/python-native-2.5.2/dont-modify-shebang-line.patch (renamed from meta-extras/packages/python/python-native-2.5.1/dont-modify-shebang-line.patch)0
-rw-r--r--meta-extras/packages/python/python_2.5.2.bb (renamed from meta-extras/packages/python/python_2.5.1.bb)51
14 files changed, 286 insertions, 116 deletions
diff --git a/meta-extras/packages/python/python-2.5-manifest.inc b/meta-extras/packages/python/python-2.5-manifest.inc
index e80da80d87..c098494d17 100644
--- a/meta-extras/packages/python/python-2.5-manifest.inc
+++ b/meta-extras/packages/python/python-2.5-manifest.inc
@@ -1,5 +1,5 @@
1######################################################################################################################## 1########################################################################################################################
2### AUTO-GENERATED by 'contrib/python/generate-manifest-2.5.py' [(C) 2002-2007 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Thu Aug 23 10:20:20 2007 2### AUTO-GENERATED by './generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Fri Mar 21 18:43:05 2008
3### 3###
4### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy 4### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
5### 5###
@@ -8,287 +8,297 @@
8######################################################################################################################## 8########################################################################################################################
9 9
10 10
11PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " 11PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
12 12
13PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " 13PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
14 14
15DESCRIPTION_python-profile="Python Basic Profiling Support" 15DESCRIPTION_python-profile="Python Basic Profiling Support"
16PR_python-profile="ml1" 16PR_python-profile="ml0"
17RDEPENDS_python-profile="python-core" 17RDEPENDS_python-profile="python-core"
18FILES_python-profile="${libdir}/python2.5/profile.* ${libdir}/python2.5/pstats.* " 18FILES_python-profile="${libdir}/python2.5/profile.* ${libdir}/python2.5/pstats.* "
19 19
20DESCRIPTION_python-threading="Python Threading & Synchronization Support" 20DESCRIPTION_python-threading="Python Threading & Synchronization Support"
21PR_python-threading="ml1" 21PR_python-threading="ml0"
22RDEPENDS_python-threading="python-core python-lang" 22RDEPENDS_python-threading="python-core python-lang"
23FILES_python-threading="${libdir}/python2.5/_threading_local.* ${libdir}/python2.5/dummy_thread.* ${libdir}/python2.5/dummy_threading.* ${libdir}/python2.5/mutex.* ${libdir}/python2.5/threading.* ${libdir}/python2.5/Queue.* " 23FILES_python-threading="${libdir}/python2.5/_threading_local.* ${libdir}/python2.5/dummy_thread.* ${libdir}/python2.5/dummy_threading.* ${libdir}/python2.5/mutex.* ${libdir}/python2.5/threading.* ${libdir}/python2.5/Queue.* "
24 24
25DESCRIPTION_python-distutils="Python Distribution Utilities" 25DESCRIPTION_python-distutils="Python Distribution Utilities"
26PR_python-distutils="ml1" 26PR_python-distutils="ml0"
27RDEPENDS_python-distutils="python-core" 27RDEPENDS_python-distutils="python-core"
28FILES_python-distutils="${libdir}/python2.5/config ${libdir}/python2.5/distutils " 28FILES_python-distutils="${libdir}/python2.5/config ${libdir}/python2.5/distutils "
29 29
30DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support" 30DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support"
31PR_python-textutils="ml1" 31PR_python-textutils="ml0"
32RDEPENDS_python-textutils="python-core python-io python-re python-stringold" 32RDEPENDS_python-textutils="python-core python-io python-re python-stringold"
33FILES_python-textutils="${libdir}/python2.5/lib-dynload/_csv.so ${libdir}/python2.5/csv.* ${libdir}/python2.5/optparse.* ${libdir}/python2.5/textwrap.* " 33FILES_python-textutils="${libdir}/python2.5/lib-dynload/_csv.so ${libdir}/python2.5/csv.* ${libdir}/python2.5/optparse.* ${libdir}/python2.5/textwrap.* "
34 34
35DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support" 35DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support"
36PR_python-codecs="ml1" 36PR_python-codecs="ml0"
37RDEPENDS_python-codecs="python-core" 37RDEPENDS_python-codecs="python-core python-lang"
38FILES_python-codecs="${libdir}/python2.5/codecs.* ${libdir}/python2.5/encodings ${libdir}/python2.5/gettext.* ${libdir}/python2.5/locale.* ${libdir}/python2.5/lib-dynload/_locale.so ${libdir}/python2.5/lib-dynload/unicodedata.so ${libdir}/python2.5/stringprep.* ${libdir}/python2.5/xdrlib.* " 38FILES_python-codecs="${libdir}/python2.5/codecs.* ${libdir}/python2.5/encodings ${libdir}/python2.5/gettext.* ${libdir}/python2.5/locale.* ${libdir}/python2.5/lib-dynload/_locale.so ${libdir}/python2.5/lib-dynload/unicodedata.so ${libdir}/python2.5/stringprep.* ${libdir}/python2.5/xdrlib.* "
39 39
40DESCRIPTION_python-ctypes="Python C Types Support"
41PR_python-ctypes="ml0"
42RDEPENDS_python-ctypes="python-core"
43FILES_python-ctypes="${libdir}/python2.5/ctypes ${libdir}/python2.5/lib-dynload/_ctypes.so "
44
40DESCRIPTION_python-pickle="Python Persistence Support" 45DESCRIPTION_python-pickle="Python Persistence Support"
41PR_python-pickle="ml1" 46PR_python-pickle="ml0"
42RDEPENDS_python-pickle="python-core python-codecs python-io python-re" 47RDEPENDS_python-pickle="python-core python-codecs python-io python-re"
43FILES_python-pickle="${libdir}/python2.5/pickle.* ${libdir}/python2.5/shelve.* ${libdir}/python2.5/lib-dynload/cPickle.so " 48FILES_python-pickle="${libdir}/python2.5/pickle.* ${libdir}/python2.5/shelve.* ${libdir}/python2.5/lib-dynload/cPickle.so "
44 49
45DESCRIPTION_python-datetime="Python Calendar and Time support" 50DESCRIPTION_python-datetime="Python Calendar and Time support"
46PR_python-datetime="ml1" 51PR_python-datetime="ml0"
47RDEPENDS_python-datetime="python-core python-codecs" 52RDEPENDS_python-datetime="python-core python-codecs"
48FILES_python-datetime="${libdir}/python2.5/_strptime.* ${libdir}/python2.5/calendar.* ${libdir}/python2.5/lib-dynload/datetime.so " 53FILES_python-datetime="${libdir}/python2.5/_strptime.* ${libdir}/python2.5/calendar.* ${libdir}/python2.5/lib-dynload/datetime.so "
49 54
50DESCRIPTION_python-core="Python Interpreter and core modules (needed!)" 55DESCRIPTION_python-core="Python Interpreter and core modules (needed!)"
51PR_python-core="ml3" 56PR_python-core="ml0"
52RDEPENDS_python-core="" 57RDEPENDS_python-core=""
53FILES_python-core="${libdir}/python2.5/__future__.* ${libdir}/python2.5/copy.* ${libdir}/python2.5/copy_reg.* ${libdir}/python2.5/ConfigParser.* ${libdir}/python2.5/getopt.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/new.* ${libdir}/python2.5/os.* ${libdir}/python2.5/posixpath.* ${libdir}/python2.5/warnings.* ${libdir}/python2.5/site.* ${libdir}/python2.5/stat.* ${libdir}/python2.5/UserDict.* ${libdir}/python2.5/UserList.* ${libdir}/python2.5/UserString.* ${libdir}/python2.5/lib-dynload/binascii.so ${libdir}/python2.5/lib-dynload/struct.so ${libdir}/python2.5/lib-dynload/time.so ${libdir}/python2.5/lib-dynload/xreadlines.so ${libdir}/python2.5/types.* ${bindir}/python* " 58FILES_python-core="${libdir}/python2.5/__future__.* ${libdir}/python2.5/copy.* ${libdir}/python2.5/copy_reg.* ${libdir}/python2.5/ConfigParser.* ${libdir}/python2.5/getopt.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/new.* ${libdir}/python2.5/os.* ${libdir}/python2.5/posixpath.* ${libdir}/python2.5/struct.* ${libdir}/python2.5/warnings.* ${libdir}/python2.5/site.* ${libdir}/python2.5/stat.* ${libdir}/python2.5/UserDict.* ${libdir}/python2.5/UserList.* ${libdir}/python2.5/UserString.* ${libdir}/python2.5/lib-dynload/binascii.so ${libdir}/python2.5/lib-dynload/_struct.so ${libdir}/python2.5/lib-dynload/time.so ${libdir}/python2.5/lib-dynload/xreadlines.so ${libdir}/python2.5/types.* ${bindir}/python* "
54 59
55DESCRIPTION_python-io="Python Low-Level I/O" 60DESCRIPTION_python-io="Python Low-Level I/O"
56PR_python-io="ml1" 61PR_python-io="ml0"
57RDEPENDS_python-io="python-core python-math" 62RDEPENDS_python-io="python-core python-math"
58FILES_python-io="${libdir}/python2.5/lib-dynload/_socket.so ${libdir}/python2.5/lib-dynload/_ssl.so ${libdir}/python2.5/lib-dynload/select.so ${libdir}/python2.5/lib-dynload/termios.so ${libdir}/python2.5/lib-dynload/cStringIO.so ${libdir}/python2.5/pipes.* ${libdir}/python2.5/socket.* ${libdir}/python2.5/tempfile.* ${libdir}/python2.5/StringIO.* " 63FILES_python-io="${libdir}/python2.5/lib-dynload/_socket.so ${libdir}/python2.5/lib-dynload/_ssl.so ${libdir}/python2.5/lib-dynload/select.so ${libdir}/python2.5/lib-dynload/termios.so ${libdir}/python2.5/lib-dynload/cStringIO.so ${libdir}/python2.5/pipes.* ${libdir}/python2.5/socket.* ${libdir}/python2.5/tempfile.* ${libdir}/python2.5/StringIO.* "
59 64
60DESCRIPTION_python-compiler="Python Compiler Support" 65DESCRIPTION_python-compiler="Python Compiler Support"
61PR_python-compiler="ml1" 66PR_python-compiler="ml0"
62RDEPENDS_python-compiler="python-core" 67RDEPENDS_python-compiler="python-core"
63FILES_python-compiler="${libdir}/python2.5/compiler " 68FILES_python-compiler="${libdir}/python2.5/compiler "
64 69
65DESCRIPTION_python-compression="Python High Level Compression Support" 70DESCRIPTION_python-compression="Python High Level Compression Support"
66PR_python-compression="ml1" 71PR_python-compression="ml0"
67RDEPENDS_python-compression="python-core python-zlib" 72RDEPENDS_python-compression="python-core python-zlib"
68FILES_python-compression="${libdir}/python2.5/gzip.* ${libdir}/python2.5/zipfile.* " 73FILES_python-compression="${libdir}/python2.5/gzip.* ${libdir}/python2.5/zipfile.* "
69 74
70DESCRIPTION_python-re="Python Regular Expression APIs" 75DESCRIPTION_python-re="Python Regular Expression APIs"
71PR_python-re="ml1" 76PR_python-re="ml0"
72RDEPENDS_python-re="python-core" 77RDEPENDS_python-re="python-core"
73FILES_python-re="${libdir}/python2.5/re.* ${libdir}/python2.5/sre.* ${libdir}/python2.5/sre_compile.* ${libdir}/python2.5/sre_constants* ${libdir}/python2.5/sre_parse.* " 78FILES_python-re="${libdir}/python2.5/re.* ${libdir}/python2.5/sre.* ${libdir}/python2.5/sre_compile.* ${libdir}/python2.5/sre_constants* ${libdir}/python2.5/sre_parse.* "
74 79
75DESCRIPTION_python-xmlrpc="Python XMLRPC Support" 80DESCRIPTION_python-xmlrpc="Python XMLRPC Support"
76PR_python-xmlrpc="ml1" 81PR_python-xmlrpc="ml0"
77RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang" 82RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang"
78FILES_python-xmlrpc="${libdir}/python2.5/xmlrpclib.* ${libdir}/python2.5/SimpleXMLRPCServer.* " 83FILES_python-xmlrpc="${libdir}/python2.5/xmlrpclib.* ${libdir}/python2.5/SimpleXMLRPCServer.* "
79 84
80DESCRIPTION_python-terminal="Python Terminal Controlling Support" 85DESCRIPTION_python-terminal="Python Terminal Controlling Support"
81PR_python-terminal="ml1" 86PR_python-terminal="ml0"
82RDEPENDS_python-terminal="python-core python-io" 87RDEPENDS_python-terminal="python-core python-io"
83FILES_python-terminal="${libdir}/python2.5/pty.* ${libdir}/python2.5/tty.* " 88FILES_python-terminal="${libdir}/python2.5/pty.* ${libdir}/python2.5/tty.* "
84 89
85DESCRIPTION_python-email="Python Email Support" 90DESCRIPTION_python-email="Python Email Support"
86PR_python-email="ml1" 91PR_python-email="ml0"
87RDEPENDS_python-email="python-core python-io python-re python-mime python-audio python-image" 92RDEPENDS_python-email="python-core python-io python-re python-mime python-audio python-image"
88FILES_python-email="${libdir}/python2.5/email " 93FILES_python-email="${libdir}/python2.5/email "
89 94
90DESCRIPTION_python-image="Python Graphical Image Handling" 95DESCRIPTION_python-image="Python Graphical Image Handling"
91PR_python-image="ml1" 96PR_python-image="ml0"
92RDEPENDS_python-image="python-core" 97RDEPENDS_python-image="python-core"
93FILES_python-image="${libdir}/python2.5/colorsys.* ${libdir}/python2.5/imghdr.* ${libdir}/python2.5/lib-dynload/imageop.so ${libdir}/python2.5/lib-dynload/rgbimg.so " 98FILES_python-image="${libdir}/python2.5/colorsys.* ${libdir}/python2.5/imghdr.* ${libdir}/python2.5/lib-dynload/imageop.so ${libdir}/python2.5/lib-dynload/rgbimg.so "
94 99
100DESCRIPTION_python-tests="Python Tests"
101PR_python-tests="ml0"
102RDEPENDS_python-tests="python-core"
103FILES_python-tests="${libdir}/python2.5/test "
104
95DESCRIPTION_python-core-dbg="Python core module debug information" 105DESCRIPTION_python-core-dbg="Python core module debug information"
96PR_python-core-dbg="ml1" 106PR_python-core-dbg="ml0"
97RDEPENDS_python-core-dbg="python-core" 107RDEPENDS_python-core-dbg="python-core"
98FILES_python-core-dbg="${libdir}/python2.5/lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug " 108FILES_python-core-dbg="${libdir}/python2.5/lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug "
99 109
100DESCRIPTION_python-resource="Python Resource Control Interface" 110DESCRIPTION_python-resource="Python Resource Control Interface"
101PR_python-resource="ml1" 111PR_python-resource="ml0"
102RDEPENDS_python-resource="python-core" 112RDEPENDS_python-resource="python-core"
103FILES_python-resource="${libdir}/python2.5/lib-dynload/resource.so " 113FILES_python-resource="${libdir}/python2.5/lib-dynload/resource.so "
104 114
105DESCRIPTION_python-devel="Python Development Package" 115DESCRIPTION_python-devel="Python Development Package"
106PR_python-devel="ml1" 116PR_python-devel="ml0"
107RDEPENDS_python-devel="python-core" 117RDEPENDS_python-devel="python-core"
108FILES_python-devel="${includedir} ${libdir}/python2.5/config " 118FILES_python-devel="${includedir} ${libdir}/python2.5/config "
109 119
110DESCRIPTION_python-math="Python Math Support" 120DESCRIPTION_python-math="Python Math Support"
111PR_python-math="ml1" 121PR_python-math="ml0"
112RDEPENDS_python-math="python-core" 122RDEPENDS_python-math="python-core"
113FILES_python-math="${libdir}/python2.5/lib-dynload/cmath.so ${libdir}/python2.5/lib-dynload/math.so ${libdir}/python2.5/lib-dynload/_random.so ${libdir}/python2.5/random.* ${libdir}/python2.5/sets.* " 123FILES_python-math="${libdir}/python2.5/lib-dynload/cmath.so ${libdir}/python2.5/lib-dynload/math.so ${libdir}/python2.5/lib-dynload/_random.so ${libdir}/python2.5/random.* ${libdir}/python2.5/sets.* "
114 124
115DESCRIPTION_python-hotshot="Python Hotshot Profiler" 125DESCRIPTION_python-hotshot="Python Hotshot Profiler"
116PR_python-hotshot="ml1" 126PR_python-hotshot="ml0"
117RDEPENDS_python-hotshot="python-core" 127RDEPENDS_python-hotshot="python-core"
118FILES_python-hotshot="${libdir}/python2.5/hotshot ${libdir}/python2.5/lib-dynload/_hotshot.so " 128FILES_python-hotshot="${libdir}/python2.5/hotshot ${libdir}/python2.5/lib-dynload/_hotshot.so "
119 129
120DESCRIPTION_python-unixadmin="Python Unix Administration Support" 130DESCRIPTION_python-unixadmin="Python Unix Administration Support"
121PR_python-unixadmin="ml1" 131PR_python-unixadmin="ml0"
122RDEPENDS_python-unixadmin="python-core" 132RDEPENDS_python-unixadmin="python-core"
123FILES_python-unixadmin="${libdir}/python2.5/lib-dynload/nis.so ${libdir}/python2.5/lib-dynload/grp.so ${libdir}/python2.5/lib-dynload/pwd.so ${libdir}/python2.5/getpass.* " 133FILES_python-unixadmin="${libdir}/python2.5/lib-dynload/nis.so ${libdir}/python2.5/lib-dynload/grp.so ${libdir}/python2.5/lib-dynload/pwd.so ${libdir}/python2.5/getpass.* "
124 134
125DESCRIPTION_python-syslog="Python's syslog Interface" 135DESCRIPTION_python-syslog="Python's Syslog Interface"
126PR_python-syslog="ml1" 136PR_python-syslog="ml0"
127RDEPENDS_python-syslog="python-core" 137RDEPENDS_python-syslog="python-core"
128FILES_python-syslog="${libdir}/python2.5/lib-dynload/syslog.so " 138FILES_python-syslog="${libdir}/python2.5/lib-dynload/syslog.so "
129 139
130DESCRIPTION_python-tkinter="Python Tcl/Tk Bindings" 140DESCRIPTION_python-tkinter="Python Tcl/Tk Bindings"
131PR_python-tkinter="ml1" 141PR_python-tkinter="ml0"
132RDEPENDS_python-tkinter="python-core" 142RDEPENDS_python-tkinter="python-core"
133FILES_python-tkinter="${libdir}/python2.5/lib-dynload/_tkinter.so ${libdir}/python2.5/lib-tk " 143FILES_python-tkinter="${libdir}/python2.5/lib-dynload/_tkinter.so ${libdir}/python2.5/lib-tk "
134 144
135DESCRIPTION_python-gdbm="Python GNU Database Support" 145DESCRIPTION_python-gdbm="Python GNU Database Support"
136PR_python-gdbm="ml1" 146PR_python-gdbm="ml0"
137RDEPENDS_python-gdbm="python-core" 147RDEPENDS_python-gdbm="python-core"
138FILES_python-gdbm="${libdir}/python2.5/lib-dynload/gdbm.so " 148FILES_python-gdbm="${libdir}/python2.5/lib-dynload/gdbm.so "
139 149
140DESCRIPTION_python-fcntl="Python's fcntl Interface" 150DESCRIPTION_python-fcntl="Python's fcntl Interface"
141PR_python-fcntl="ml1" 151PR_python-fcntl="ml0"
142RDEPENDS_python-fcntl="python-core" 152RDEPENDS_python-fcntl="python-core"
143FILES_python-fcntl="${libdir}/python2.5/lib-dynload/fcntl.so " 153FILES_python-fcntl="${libdir}/python2.5/lib-dynload/fcntl.so "
144 154
145DESCRIPTION_python-netclient="Python Internet Protocol Clients" 155DESCRIPTION_python-netclient="Python Internet Protocol Clients"
146PR_python-netclient="ml2" 156PR_python-netclient="ml0"
147RDEPENDS_python-netclient="python-core python-datetime python-io python-lang python-logging python-mime python-stringold" 157RDEPENDS_python-netclient="python-core python-crypt python-datetime python-io python-lang python-logging python-mime"
148FILES_python-netclient="${libdir}/python2.5/*Cookie*.* ${libdir}/python2.5/base64.* ${libdir}/python2.5/cookielib.* ${libdir}/python2.5/ftplib.* ${libdir}/python2.5/gopherlib.* ${libdir}/python2.5/hmac.* ${libdir}/python2.5/httplib.* ${libdir}/python2.5/mimetypes.* ${libdir}/python2.5/nntplib.* ${libdir}/python2.5/poplib.* ${libdir}/python2.5/smtplib.* ${libdir}/python2.5/telnetlib.* ${libdir}/python2.5/urllib.* ${libdir}/python2.5/urllib2.* ${libdir}/python2.5/urlparse.* " 158FILES_python-netclient="${libdir}/python2.5/*Cookie*.* ${libdir}/python2.5/base64.* ${libdir}/python2.5/cookielib.* ${libdir}/python2.5/ftplib.* ${libdir}/python2.5/gopherlib.* ${libdir}/python2.5/hmac.* ${libdir}/python2.5/httplib.* ${libdir}/python2.5/mimetypes.* ${libdir}/python2.5/nntplib.* ${libdir}/python2.5/poplib.* ${libdir}/python2.5/smtplib.* ${libdir}/python2.5/telnetlib.* ${libdir}/python2.5/urllib.* ${libdir}/python2.5/urllib2.* ${libdir}/python2.5/urlparse.* "
149 159
150DESCRIPTION_python-pprint="Python Pretty-Print Support" 160DESCRIPTION_python-pprint="Python Pretty-Print Support"
151PR_python-pprint="ml1" 161PR_python-pprint="ml0"
152RDEPENDS_python-pprint="python-core" 162RDEPENDS_python-pprint="python-core"
153FILES_python-pprint="${libdir}/python2.5/pprint.* " 163FILES_python-pprint="${libdir}/python2.5/pprint.* "
154 164
155DESCRIPTION_python-netserver="Python Internet Protocol Servers" 165DESCRIPTION_python-netserver="Python Internet Protocol Servers"
156PR_python-netserver="ml1" 166PR_python-netserver="ml0"
157RDEPENDS_python-netserver="python-core python-netclient" 167RDEPENDS_python-netserver="python-core python-netclient"
158FILES_python-netserver="${libdir}/python2.5/cgi.* ${libdir}/python2.5/BaseHTTPServer.* ${libdir}/python2.5/SimpleHTTPServer.* ${libdir}/python2.5/SocketServer.* " 168FILES_python-netserver="${libdir}/python2.5/cgi.* ${libdir}/python2.5/BaseHTTPServer.* ${libdir}/python2.5/SimpleHTTPServer.* ${libdir}/python2.5/SocketServer.* "
159 169
160DESCRIPTION_python-curses="Python Curses Support" 170DESCRIPTION_python-curses="Python Curses Support"
161PR_python-curses="ml1" 171PR_python-curses="ml0"
162RDEPENDS_python-curses="python-core" 172RDEPENDS_python-curses="python-core"
163FILES_python-curses="${libdir}/python2.5/curses ${libdir}/python2.5/lib-dynload/_curses.so ${libdir}/python2.5/lib-dynload/_curses_panel.so " 173FILES_python-curses="${libdir}/python2.5/curses ${libdir}/python2.5/lib-dynload/_curses.so ${libdir}/python2.5/lib-dynload/_curses_panel.so "
164 174
165DESCRIPTION_python-smtpd="Python Simple Mail Transport Daemon" 175DESCRIPTION_python-smtpd="Python Simple Mail Transport Daemon"
166PR_python-smtpd="ml1" 176PR_python-smtpd="ml0"
167RDEPENDS_python-smtpd="python-core python-netserver python-email python-mime" 177RDEPENDS_python-smtpd="python-core python-netserver python-email python-mime"
168FILES_python-smtpd="${bindir}/smtpd.* " 178FILES_python-smtpd="${bindir}/smtpd.* "
169 179
170DESCRIPTION_python-html="Python HTML Processing" 180DESCRIPTION_python-html="Python HTML Processing"
171PR_python-html="ml1" 181PR_python-html="ml0"
172RDEPENDS_python-html="python-core" 182RDEPENDS_python-html="python-core"
173FILES_python-html="${libdir}/python2.5/formatter.* ${libdir}/python2.5/htmlentitydefs.* ${libdir}/python2.5/htmllib.* ${libdir}/python2.5/markupbase.* ${libdir}/python2.5/sgmllib.* " 183FILES_python-html="${libdir}/python2.5/formatter.* ${libdir}/python2.5/htmlentitydefs.* ${libdir}/python2.5/htmllib.* ${libdir}/python2.5/markupbase.* ${libdir}/python2.5/sgmllib.* "
174 184
175DESCRIPTION_python-readline="Python Readline Support" 185DESCRIPTION_python-readline="Python Readline Support"
176PR_python-readline="ml1" 186PR_python-readline="ml0"
177RDEPENDS_python-readline="python-core" 187RDEPENDS_python-readline="python-core"
178FILES_python-readline="${libdir}/python2.5/lib-dynload/readline.so ${libdir}/python2.5/rlcompleter.* " 188FILES_python-readline="${libdir}/python2.5/lib-dynload/readline.so ${libdir}/python2.5/rlcompleter.* "
179 189
180DESCRIPTION_python-subprocess="Python Subprocess Support" 190DESCRIPTION_python-subprocess="Python Subprocess Support"
181PR_python-subprocess="ml1" 191PR_python-subprocess="ml0"
182RDEPENDS_python-subprocess="python-core python-io python-re python-fcntl python-pickle" 192RDEPENDS_python-subprocess="python-core python-io python-re python-fcntl python-pickle"
183FILES_python-subprocess="${libdir}/python2.5/subprocess.* " 193FILES_python-subprocess="${libdir}/python2.5/subprocess.* "
184 194
185DESCRIPTION_python-pydoc="Python Interactive Help Support" 195DESCRIPTION_python-pydoc="Python Interactive Help Support"
186PR_python-pydoc="ml1" 196PR_python-pydoc="ml0"
187RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re" 197RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re"
188FILES_python-pydoc="${bindir}/pydoc ${libdir}/python2.5/pydoc.* " 198FILES_python-pydoc="${bindir}/pydoc ${libdir}/python2.5/pydoc.* "
189 199
190DESCRIPTION_python-logging="Python Logging Support" 200DESCRIPTION_python-logging="Python Logging Support"
191PR_python-logging="ml1" 201PR_python-logging="ml0"
192RDEPENDS_python-logging="python-core" 202RDEPENDS_python-logging="python-core python-io python-lang python-stringold"
193FILES_python-logging="${libdir}/python2.5/logging " 203FILES_python-logging="${libdir}/python2.5/logging "
194 204
195DESCRIPTION_python-mailbox="Python Mailbox Format Support" 205DESCRIPTION_python-mailbox="Python Mailbox Format Support"
196PR_python-mailbox="ml1" 206PR_python-mailbox="ml0"
197RDEPENDS_python-mailbox="python-core python-mime" 207RDEPENDS_python-mailbox="python-core python-mime"
198FILES_python-mailbox="${libdir}/python2.5/mailbox.* " 208FILES_python-mailbox="${libdir}/python2.5/mailbox.* "
199 209
200DESCRIPTION_python-xml="Python basic XML support." 210DESCRIPTION_python-xml="Python basic XML support."
201PR_python-xml="ml2" 211PR_python-xml="ml0"
202RDEPENDS_python-xml="python-core python-re python-netclient" 212RDEPENDS_python-xml="python-core python-re python-netclient"
203FILES_python-xml="${libdir}/python2.5/lib-dynload/pyexpat.so ${libdir}/python2.5/xml ${libdir}/python2.5/xmllib.* " 213FILES_python-xml="${libdir}/python2.5/lib-dynload/pyexpat.so ${libdir}/python2.5/xml ${libdir}/python2.5/xmllib.* "
204 214
205DESCRIPTION_python-mime="Python MIME Handling APIs" 215DESCRIPTION_python-mime="Python MIME Handling APIs"
206PR_python-mime="ml1" 216PR_python-mime="ml0"
207RDEPENDS_python-mime="python-core python-io" 217RDEPENDS_python-mime="python-core python-io"
208FILES_python-mime="${libdir}/python2.5/mimetools.* ${libdir}/python2.5/uu.* ${libdir}/python2.5/quopri.* ${libdir}/python2.5/rfc822.* " 218FILES_python-mime="${libdir}/python2.5/mimetools.* ${libdir}/python2.5/uu.* ${libdir}/python2.5/quopri.* ${libdir}/python2.5/rfc822.* "
209 219
210DESCRIPTION_python-sqlite3="Python Sqlite3 Database Support" 220DESCRIPTION_python-sqlite3="Python Sqlite3 Database Support"
211PR_python-sqlite3="ml1" 221PR_python-sqlite3="ml2"
212RDEPENDS_python-sqlite3="python-core" 222RDEPENDS_python-sqlite3="python-core python-datetime python-lang python-crypt python-io python-threading python-zlib"
213FILES_python-sqlite3="${libdir}/python2.5/sqlite3 " 223FILES_python-sqlite3="${libdir}/python2.5/lib-dynload/_sqlite3.so ${libdir}/python2.5/sqlite3/dbapi2.* ${libdir}/python2.5/sqlite3/__init__.* "
214 224
215DESCRIPTION_python-tests="Python Tests" 225DESCRIPTION_python-sqlite3-tests="Python Sqlite3 Database Support Tests"
216PR_python-tests="ml1" 226PR_python-sqlite3-tests="ml0"
217RDEPENDS_python-tests="python-core" 227RDEPENDS_python-sqlite3-tests="python-core python-sqlite3"
218FILES_python-tests="${libdir}/python2.5/test " 228FILES_python-sqlite3-tests="${libdir}/python2.5/sqlite3/test "
219 229
220DESCRIPTION_python-unittest="Python Unit Testing Framework" 230DESCRIPTION_python-unittest="Python Unit Testing Framework"
221PR_python-unittest="ml1" 231PR_python-unittest="ml0"
222RDEPENDS_python-unittest="python-core python-stringold python-lang" 232RDEPENDS_python-unittest="python-core python-stringold python-lang"
223FILES_python-unittest="${libdir}/python2.5/unittest.* " 233FILES_python-unittest="${libdir}/python2.5/unittest.* "
224 234
225DESCRIPTION_python-stringold="Python String APIs [deprecated]" 235DESCRIPTION_python-stringold="Python String APIs [deprecated]"
226PR_python-stringold="ml1" 236PR_python-stringold="ml0"
227RDEPENDS_python-stringold="python-core python-re" 237RDEPENDS_python-stringold="python-core python-re"
228FILES_python-stringold="${libdir}/python2.5/lib-dynload/strop.so ${libdir}/python2.5/string.* " 238FILES_python-stringold="${libdir}/python2.5/lib-dynload/strop.so ${libdir}/python2.5/string.* "
229 239
230DESCRIPTION_python-robotparser="Python robots.txt parser" 240DESCRIPTION_python-robotparser="Python robots.txt parser"
231PR_python-robotparser="ml1" 241PR_python-robotparser="ml0"
232RDEPENDS_python-robotparser="python-core python-netclient" 242RDEPENDS_python-robotparser="python-core python-netclient"
233FILES_python-robotparser="${libdir}/python2.5/robotparser.* " 243FILES_python-robotparser="${libdir}/python2.5/robotparser.* "
234 244
235DESCRIPTION_python-lib-old-and-deprecated="Python Deprecated Libraries" 245DESCRIPTION_python-lib-old-and-deprecated="Python Deprecated Libraries"
236PR_python-lib-old-and-deprecated="ml1" 246PR_python-lib-old-and-deprecated="ml0"
237RDEPENDS_python-lib-old-and-deprecated="python-core" 247RDEPENDS_python-lib-old-and-deprecated="python-core"
238FILES_python-lib-old-and-deprecated="${libdir}/python2.5/lib-old " 248FILES_python-lib-old-and-deprecated="${libdir}/python2.5/lib-old "
239 249
240DESCRIPTION_python-compile="Python Bytecode Compilation Support" 250DESCRIPTION_python-compile="Python Bytecode Compilation Support"
241PR_python-compile="ml1" 251PR_python-compile="ml0"
242RDEPENDS_python-compile="python-core" 252RDEPENDS_python-compile="python-core"
243FILES_python-compile="${libdir}/python2.5/py_compile.* ${libdir}/python2.5/compileall.* " 253FILES_python-compile="${libdir}/python2.5/py_compile.* ${libdir}/python2.5/compileall.* "
244 254
245DESCRIPTION_python-debugger="Python Debugger" 255DESCRIPTION_python-debugger="Python Debugger"
246PR_python-debugger="ml1" 256PR_python-debugger="ml0"
247RDEPENDS_python-debugger="python-core python-io python-lang python-re python-stringold python-shell" 257RDEPENDS_python-debugger="python-core python-io python-lang python-re python-stringold python-shell"
248FILES_python-debugger="${libdir}/python2.5/bdb.* ${libdir}/python2.5/pdb.* " 258FILES_python-debugger="${libdir}/python2.5/bdb.* ${libdir}/python2.5/pdb.* "
249 259
250DESCRIPTION_python-shell="Python Shell-Like Functionality" 260DESCRIPTION_python-shell="Python Shell-Like Functionality"
251PR_python-shell="ml1" 261PR_python-shell="ml0"
252RDEPENDS_python-shell="python-core python-re" 262RDEPENDS_python-shell="python-core python-re"
253FILES_python-shell="${libdir}/python2.5/cmd.* ${libdir}/python2.5/commands.* ${libdir}/python2.5/dircache.* ${libdir}/python2.5/fnmatch.* ${libdir}/python2.5/glob.* ${libdir}/python2.5/popen2.* ${libdir}/python2.5/shutil.* " 263FILES_python-shell="${libdir}/python2.5/cmd.* ${libdir}/python2.5/commands.* ${libdir}/python2.5/dircache.* ${libdir}/python2.5/fnmatch.* ${libdir}/python2.5/glob.* ${libdir}/python2.5/popen2.* ${libdir}/python2.5/shutil.* "
254 264
255DESCRIPTION_python-bsddb="Python Berkeley Database Bindings" 265DESCRIPTION_python-bsddb="Python Berkeley Database Bindings"
256PR_python-bsddb="ml1" 266PR_python-bsddb="ml0"
257RDEPENDS_python-bsddb="python-core" 267RDEPENDS_python-bsddb="python-core"
258FILES_python-bsddb="${libdir}/python2.5/bsddb " 268FILES_python-bsddb="${libdir}/python2.5/bsddb "
259 269
260DESCRIPTION_python-mmap="Python Memory-Mapped-File Support" 270DESCRIPTION_python-mmap="Python Memory-Mapped-File Support"
261PR_python-mmap="ml1" 271PR_python-mmap="ml0"
262RDEPENDS_python-mmap="python-core python-io" 272RDEPENDS_python-mmap="python-core python-io"
263FILES_python-mmap="${libdir}/python2.5/lib-dynload/mmap.so " 273FILES_python-mmap="${libdir}/python2.5/lib-dynload/mmap.so "
264 274
265DESCRIPTION_python-zlib="Python zlib Support." 275DESCRIPTION_python-zlib="Python zlib Support."
266PR_python-zlib="ml1" 276PR_python-zlib="ml0"
267RDEPENDS_python-zlib="python-core" 277RDEPENDS_python-zlib="python-core"
268FILES_python-zlib="${libdir}/python2.5/lib-dynload/zlib.so " 278FILES_python-zlib="${libdir}/python2.5/lib-dynload/zlib.so "
269 279
270DESCRIPTION_python-db="Python File-Based Database Support" 280DESCRIPTION_python-db="Python File-Based Database Support"
271PR_python-db="ml1" 281PR_python-db="ml0"
272RDEPENDS_python-db="python-core" 282RDEPENDS_python-db="python-core"
273FILES_python-db="${libdir}/python2.5/anydbm.* ${libdir}/python2.5/dumbdbm.* ${libdir}/python2.5/whichdb.* " 283FILES_python-db="${libdir}/python2.5/anydbm.* ${libdir}/python2.5/dumbdbm.* ${libdir}/python2.5/whichdb.* "
274 284
275DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support" 285DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support"
276PR_python-crypt="ml1" 286PR_python-crypt="ml1"
277RDEPENDS_python-crypt="python-core" 287RDEPENDS_python-crypt="python-core"
278FILES_python-crypt="${libdir}/python2.5/lib-dynload/crypt.so ${libdir}/python2.5/lib-dynload/md5.so ${libdir}/python2.5/lib-dynload/rotor.so ${libdir}/python2.5/lib-dynload/sha.so " 288FILES_python-crypt="${libdir}/python2.5/hashlib.* ${libdir}/python2.5/md5.* ${libdir}/python2.5/sha.* ${libdir}/python2.5/lib-dynload/crypt.so ${libdir}/python2.5/lib-dynload/_hashlib.so ${libdir}/python2.5/lib-dynload/_sha256.so ${libdir}/python2.5/lib-dynload/_sha512.so "
279 289
280DESCRIPTION_python-idle="Python Integrated Development Environment" 290DESCRIPTION_python-idle="Python Integrated Development Environment"
281PR_python-idle="ml1" 291PR_python-idle="ml0"
282RDEPENDS_python-idle="python-core python-tkinter" 292RDEPENDS_python-idle="python-core python-tkinter"
283FILES_python-idle="${bindir}/idle ${libdir}/python2.5/idlelib " 293FILES_python-idle="${bindir}/idle ${libdir}/python2.5/idlelib "
284 294
285DESCRIPTION_python-lang="Python Low-Level Language Support" 295DESCRIPTION_python-lang="Python Low-Level Language Support"
286PR_python-lang="ml1" 296PR_python-lang="ml0"
287RDEPENDS_python-lang="python-core" 297RDEPENDS_python-lang="python-core"
288FILES_python-lang="${libdir}/python2.5/lib-dynload/array.so ${libdir}/python2.5/lib-dynload/parser.so ${libdir}/python2.5/lib-dynload/operator.so ${libdir}/python2.5/lib-dynload/_weakref.so ${libdir}/python2.5/lib-dynload/itertools.so ${libdir}/python2.5/lib-dynload/collections.so ${libdir}/python2.5/lib-dynload/_bisect.so ${libdir}/python2.5/lib-dynload/_heapq.so ${libdir}/python2.5/atexit.* ${libdir}/python2.5/bisect.* ${libdir}/python2.5/code.* ${libdir}/python2.5/codeop.* ${libdir}/python2.5/dis.* ${libdir}/python2.5/heapq.* ${libdir}/python2.5/inspect.* ${libdir}/python2.5/keyword.* ${libdir}/python2.5/opcode.* ${libdir}/python2.5/repr.* ${libdir}/python2.5/token.* ${libdir}/python2.5/tokenize.* ${libdir}/python2.5/traceback.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/weakref.* " 298FILES_python-lang="${libdir}/python2.5/lib-dynload/array.so ${libdir}/python2.5/lib-dynload/parser.so ${libdir}/python2.5/lib-dynload/operator.so ${libdir}/python2.5/lib-dynload/_weakref.so ${libdir}/python2.5/lib-dynload/itertools.so ${libdir}/python2.5/lib-dynload/collections.so ${libdir}/python2.5/lib-dynload/_bisect.so ${libdir}/python2.5/lib-dynload/_heapq.so ${libdir}/python2.5/atexit.* ${libdir}/python2.5/bisect.* ${libdir}/python2.5/code.* ${libdir}/python2.5/codeop.* ${libdir}/python2.5/dis.* ${libdir}/python2.5/heapq.* ${libdir}/python2.5/inspect.* ${libdir}/python2.5/keyword.* ${libdir}/python2.5/opcode.* ${libdir}/python2.5/repr.* ${libdir}/python2.5/token.* ${libdir}/python2.5/tokenize.* ${libdir}/python2.5/traceback.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/weakref.* "
289 299
290DESCRIPTION_python-audio="Python Audio Handling" 300DESCRIPTION_python-audio="Python Audio Handling"
291PR_python-audio="ml1" 301PR_python-audio="ml0"
292RDEPENDS_python-audio="python-core" 302RDEPENDS_python-audio="python-core"
293FILES_python-audio="${libdir}/python2.5/wave.* ${libdir}/python2.5/chunk.* ${libdir}/python2.5/sndhdr.* ${libdir}/python2.5/lib-dynload/ossaudiodev.so ${libdir}/python2.5/lib-dynload/audioop.so " 303FILES_python-audio="${libdir}/python2.5/wave.* ${libdir}/python2.5/chunk.* ${libdir}/python2.5/sndhdr.* ${libdir}/python2.5/lib-dynload/ossaudiodev.so ${libdir}/python2.5/lib-dynload/audioop.so "
294 304
diff --git a/meta-extras/packages/python/python-2.5.1/autohell.patch b/meta-extras/packages/python/python-2.5.2/autohell.patch
index e2d63145be..32977955d4 100644
--- a/meta-extras/packages/python/python-2.5.1/autohell.patch
+++ b/meta-extras/packages/python/python-2.5.2/autohell.patch
@@ -1,22 +1,19 @@
1# 1Index: Python-2.5.2/configure.in
2# FIXME: Don't simply rip this test out... add getting it from cache
3#
4Index: Python-2.5.1/configure.in
5=================================================================== 2===================================================================
6--- Python-2.5.1.orig/configure.in 3--- Python-2.5.2.orig/configure.in
7+++ Python-2.5.1/configure.in 4+++ Python-2.5.2/configure.in
8@@ -3367,41 +3367,6 @@ else 5@@ -3410,45 +3410,6 @@ esac
9 AC_MSG_RESULT(no) 6
10 fi 7
11 8
12-AC_MSG_CHECKING(for %zd printf() format support) 9-AC_MSG_CHECKING(for %zd printf() format support)
13-AC_TRY_RUN([#include <stdio.h> 10-AC_TRY_RUN([#include <stdio.h>
14-#include <stddef.h> 11-#include <stddef.h>
15-#include <string.h> 12-#include <string.h>
16- 13-
17-int main() 14-#ifdef HAVE_SYS_TYPES_H
18-{ 15-#include <sys/types.h>
19- char buffer[256]; 16-#endif
20- 17-
21-#ifdef HAVE_SSIZE_T 18-#ifdef HAVE_SSIZE_T
22-typedef ssize_t Py_ssize_t; 19-typedef ssize_t Py_ssize_t;
@@ -26,6 +23,10 @@ Index: Python-2.5.1/configure.in
26-typedef int Py_ssize_t; 23-typedef int Py_ssize_t;
27-#endif 24-#endif
28- 25-
26-int main()
27-{
28- char buffer[256];
29-
29- if(sprintf(buffer, "%zd", (size_t)123) < 0) 30- if(sprintf(buffer, "%zd", (size_t)123) < 0)
30- return 1; 31- return 1;
31- 32-
diff --git a/meta-extras/packages/python/python-2.5.1/bindir-libdir.patch b/meta-extras/packages/python/python-2.5.2/bindir-libdir.patch
index 047c358a55..047c358a55 100644
--- a/meta-extras/packages/python/python-2.5.1/bindir-libdir.patch
+++ b/meta-extras/packages/python/python-2.5.2/bindir-libdir.patch
diff --git a/meta-extras/packages/python/python-2.5.1/crosscompile.patch b/meta-extras/packages/python/python-2.5.2/crosscompile.patch
index f456048ef5..f1b1c6f3e0 100644
--- a/meta-extras/packages/python/python-2.5.1/crosscompile.patch
+++ b/meta-extras/packages/python/python-2.5.2/crosscompile.patch
@@ -1,11 +1,11 @@
1# 1#
2# Patch (C) by Michael 'Mickey' Lauer <mlauer@vanille-media.de> 2# Patch (C) by Michael 'Mickey' Lauer <mlauer@vanille-media.de>
3# 3#
4Index: Python-2.5.1/Makefile.pre.in 4Index: Python-2.5.2/Makefile.pre.in
5=================================================================== 5===================================================================
6--- Python-2.5.1.orig/Makefile.pre.in 6--- Python-2.5.2.orig/Makefile.pre.in
7+++ Python-2.5.1/Makefile.pre.in 7+++ Python-2.5.2/Makefile.pre.in
8@@ -170,6 +170,7 @@ UNICODE_OBJS= @UNICODE_OBJS@ 8@@ -173,6 +173,7 @@ UNICODE_OBJS= @UNICODE_OBJS@
9 9
10 PYTHON= python$(EXE) 10 PYTHON= python$(EXE)
11 BUILDPYTHON= python$(BUILDEXE) 11 BUILDPYTHON= python$(BUILDEXE)
@@ -13,7 +13,7 @@ Index: Python-2.5.1/Makefile.pre.in
13 13
14 # === Definitions added by makesetup === 14 # === Definitions added by makesetup ===
15 15
16@@ -196,7 +197,7 @@ GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar 16@@ -199,7 +200,7 @@ GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar
17 ########################################################################## 17 ##########################################################################
18 # Parser 18 # Parser
19 PGEN= Parser/pgen$(EXE) 19 PGEN= Parser/pgen$(EXE)
@@ -22,7 +22,7 @@ Index: Python-2.5.1/Makefile.pre.in
22 POBJS= \ 22 POBJS= \
23 Parser/acceler.o \ 23 Parser/acceler.o \
24 Parser/grammar1.o \ 24 Parser/grammar1.o \
25@@ -345,8 +346,8 @@ platform: $(BUILDPYTHON) 25@@ -348,8 +349,8 @@ platform: $(BUILDPYTHON)
26 # Build the shared modules 26 # Build the shared modules
27 sharedmods: $(BUILDPYTHON) 27 sharedmods: $(BUILDPYTHON)
28 case $$MAKEFLAGS in \ 28 case $$MAKEFLAGS in \
@@ -33,16 +33,16 @@ Index: Python-2.5.1/Makefile.pre.in
33 esac 33 esac
34 34
35 # Build static library 35 # Build static library
36@@ -470,7 +471,7 @@ Modules/python.o: $(srcdir)/Modules/pyth 36@@ -474,7 +475,7 @@ Modules/python.o: $(srcdir)/Modules/pyth
37
38 37
39 $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) 38 $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
39 -@ mkdir Include
40- -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) 40- -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
41+ -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) 41+ -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
42 42
43 $(PGEN): $(PGENOBJS) 43 $(PGEN): $(PGENOBJS)
44 $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) 44 $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
45@@ -773,19 +774,19 @@ libinstall: $(BUILDPYTHON) $(srcdir)/Lib 45@@ -782,19 +783,19 @@ libinstall: $(BUILDPYTHON) $(srcdir)/Lib
46 done 46 done
47 $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt 47 $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
48 PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ 48 PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
@@ -66,7 +66,7 @@ Index: Python-2.5.1/Makefile.pre.in
66 -d $(LIBDEST)/site-packages -f \ 66 -d $(LIBDEST)/site-packages -f \
67 -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages 67 -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
68 68
69@@ -885,7 +886,7 @@ libainstall: all 69@@ -894,7 +895,7 @@ libainstall: all
70 # Install the dynamically loadable modules 70 # Install the dynamically loadable modules
71 # This goes into $(exec_prefix) 71 # This goes into $(exec_prefix)
72 sharedinstall: 72 sharedinstall:
@@ -75,10 +75,10 @@ Index: Python-2.5.1/Makefile.pre.in
75 --prefix=$(prefix) \ 75 --prefix=$(prefix) \
76 --install-scripts=$(BINDIR) \ 76 --install-scripts=$(BINDIR) \
77 --install-platlib=$(DESTSHARED) \ 77 --install-platlib=$(DESTSHARED) \
78Index: Python-2.5.1/setup.py 78Index: Python-2.5.2/setup.py
79=================================================================== 79===================================================================
80--- Python-2.5.1.orig/setup.py 80--- Python-2.5.2.orig/setup.py
81+++ Python-2.5.1/setup.py 81+++ Python-2.5.2/setup.py
82@@ -211,6 +211,7 @@ class PyBuildExt(build_ext): 82@@ -211,6 +211,7 @@ class PyBuildExt(build_ext):
83 except ImportError, why: 83 except ImportError, why:
84 self.announce('*** WARNING: renaming "%s" since importing it' 84 self.announce('*** WARNING: renaming "%s" since importing it'
@@ -98,7 +98,7 @@ Index: Python-2.5.1/setup.py
98 98
99 # Add paths specified in the environment variables LDFLAGS and 99 # Add paths specified in the environment variables LDFLAGS and
100 # CPPFLAGS for header and library files. 100 # CPPFLAGS for header and library files.
101@@ -341,6 +342,9 @@ class PyBuildExt(build_ext): 101@@ -342,6 +343,9 @@ class PyBuildExt(build_ext):
102 102
103 # XXX Omitted modules: gl, pure, dl, SGI-specific modules 103 # XXX Omitted modules: gl, pure, dl, SGI-specific modules
104 104
diff --git a/meta-extras/packages/python/python-2.5.1/default-is-optimized.patch b/meta-extras/packages/python/python-2.5.2/default-is-optimized.patch
index 6beeb6e022..6beeb6e022 100644
--- a/meta-extras/packages/python/python-2.5.1/default-is-optimized.patch
+++ b/meta-extras/packages/python/python-2.5.2/default-is-optimized.patch
diff --git a/meta-extras/packages/python/python-2.5.2/enable-ctypes-module.patch b/meta-extras/packages/python/python-2.5.2/enable-ctypes-module.patch
new file mode 100644
index 0000000000..dd5adaf0e7
--- /dev/null
+++ b/meta-extras/packages/python/python-2.5.2/enable-ctypes-module.patch
@@ -0,0 +1,106 @@
1diff -Naur Python-2.5.1.orig/setup.py Python-2.5.1/setup.py
2--- Python-2.5.orig/setup.py 2006-08-10 01:42:18.000000000 +0200
3+++ Python-2.5/setup.py 2007-11-21 18:00:43.000000000 +0100
4@@ -1321,16 +1329,16 @@
5 ffi_configfile):
6 from distutils.dir_util import mkpath
7 mkpath(ffi_builddir)
8- config_args = []
9+ config_args = ['--host=%s' % os.environ["HOST_SYS"], ]
10
11 # Pass empty CFLAGS because we'll just append the resulting
12 # CFLAGS to Python's; -g or -O2 is to be avoided.
13- cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \
14- % (ffi_builddir, ffi_srcdir, " ".join(config_args))
15+ cmd = "(cd %s && autoconf -W cross) && (cd %s && env CFLAGS='' '%s/configure' %s)" \
16+ % (ffi_srcdir, ffi_builddir, ffi_srcdir, " ".join(config_args))
17
18 res = os.system(cmd)
19 if res or not os.path.exists(ffi_configfile):
20- print "Failed to configure _ctypes module"
21+ print "Failed to configure _ctypes module, ret %d or missing %s"% (res, ffi_configfile, )
22 return False
23
24 fficonfig = {}
25diff -Naur Python-2.5.1.orig/Modules/_ctypes/callbacks.c Python-2.5.1/Modules/_ctypes/callbacks.c
26--- Python-2.5.1.orig/Modules/_ctypes/callbacks.c 2006-10-17 21:41:10.000000000 +0200
27+++ Python-2.5.1/Modules/_ctypes/callbacks.c 2007-11-22 10:29:33.000000000 +0100
28@@ -273,11 +273,13 @@
29 PyErr_NoMemory();
30 return NULL;
31 }
32+#if FFI_CLOSURES
33 p->pcl = MallocClosure();
34 if (p->pcl == NULL) {
35 PyErr_NoMemory();
36 goto error;
37 }
38+#endif
39
40 for (i = 0; i < nArgs; ++i) {
41 PyObject *cnv = PySequence_GetItem(converters, i);
42@@ -315,12 +317,14 @@
43 "ffi_prep_cif failed with %d", result);
44 goto error;
45 }
46+#if FFI_CLOSURES
47 result = ffi_prep_closure(p->pcl, &p->cif, closure_fcn, p);
48 if (result != FFI_OK) {
49 PyErr_Format(PyExc_RuntimeError,
50 "ffi_prep_closure failed with %d", result);
51 goto error;
52 }
53+#endif
54
55 p->converters = converters;
56 p->callable = callable;
57@@ -328,8 +332,10 @@
58
59 error:
60 if (p) {
61+#if FFI_CLOSURES
62 if (p->pcl)
63 FreeClosure(p->pcl);
64+#endif
65 PyMem_Free(p);
66 }
67 return NULL;
68diff -Naur Python-2.5.1.orig/Modules/_ctypes/_ctypes.c Python-2.5.1/Modules/_ctypes/_ctypes.c
69--- Python-2.5.1.orig/Modules/_ctypes/_ctypes.c 2007-03-23 20:56:45.000000000 +0100
70+++ Python-2.5.1/Modules/_ctypes/_ctypes.c 2007-11-22 10:29:01.000000000 +0100
71@@ -3419,7 +3419,9 @@
72 Py_CLEAR(self->paramflags);
73
74 if (self->thunk) {
75+#if FFI_CLOSURES
76 FreeClosure(self->thunk->pcl);
77+#endif
78 PyMem_Free(self->thunk);
79 self->thunk = NULL;
80 }
81diff -Naur Python-2.5.1.orig/Modules/_ctypes/ctypes.h Python-2.5.1/Modules/_ctypes/ctypes.h
82--- Python-2.5.1.orig/Modules/_ctypes/ctypes.h 2006-08-14 13:17:48.000000000 +0200
83+++ Python-2.5.1/Modules/_ctypes/ctypes.h 2007-11-22 10:29:44.000000000 +0100
84@@ -68,7 +68,9 @@
85 };
86
87 typedef struct {
88+#if FFI_CLOSURES
89 ffi_closure *pcl; /* the C callable */
90+#endif
91 ffi_cif cif;
92 PyObject *converters;
93 PyObject *callable;
94diff -Naur Python-2.5.1.orig/Modules/_ctypes/malloc_closure.c Python-2.5.1/Modules/_ctypes/malloc_closure.c
95--- Python-2.5.1.orig/Modules/_ctypes/malloc_closure.c 2006-06-12 22:56:48.000000000 +0200
96+++ Python-2.5.1/Modules/_ctypes/malloc_closure.c 2007-11-22 10:30:17.000000000 +0100
97@@ -27,7 +27,9 @@
98 /******************************************************************/
99
100 typedef union _tagITEM {
101+#if FFI_CLOSURES
102 ffi_closure closure;
103+#endif
104 union _tagITEM *next;
105 } ITEM;
106
diff --git a/meta-extras/packages/python/python-2.5.1/fix-tkinter-detection.patch b/meta-extras/packages/python/python-2.5.2/fix-tkinter-detection.patch
index 93bd343381..93bd343381 100644
--- a/meta-extras/packages/python/python-2.5.1/fix-tkinter-detection.patch
+++ b/meta-extras/packages/python/python-2.5.2/fix-tkinter-detection.patch
diff --git a/meta-extras/packages/python/python-2.5.1/sitebranding.patch b/meta-extras/packages/python/python-2.5.2/sitebranding.patch
index c6e486ae97..c6e486ae97 100644
--- a/meta-extras/packages/python/python-2.5.1/sitebranding.patch
+++ b/meta-extras/packages/python/python-2.5.2/sitebranding.patch
diff --git a/meta-extras/packages/python/python-2.5.2/sitecustomize.py b/meta-extras/packages/python/python-2.5.2/sitecustomize.py
new file mode 100644
index 0000000000..ec626b4b63
--- /dev/null
+++ b/meta-extras/packages/python/python-2.5.2/sitecustomize.py
@@ -0,0 +1,44 @@
1# OpenEmbedded sitecustomize.py (C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
2# GPLv2 or later
3# Version: 20082201
4# Features:
5# * set proper default encoding
6# * enable readline completion in the interactive interpreter
7# * load command line history on startup
8# * save command line history on exit
9
10import os
11
12def __exithandler():
13 try:
14 readline.write_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) )
15 except IOError:
16 pass
17
18def __registerExitHandler():
19 import atexit
20 atexit.register( __exithandler )
21
22def __enableReadlineSupport():
23 readline.parse_and_bind("tab: complete")
24 try:
25 readline.read_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) )
26 except IOError:
27 pass
28
29def __enableDefaultEncoding():
30 import sys
31 try:
32 sys.setdefaultencoding('utf8')
33 except LookupError:
34 pass
35
36import sys
37try:
38 import rlcompleter, readline
39except ImportError:
40 pass
41else:
42 __enableDefaultEncoding()
43 __registerExitHandler()
44 __enableReadlineSupport()
diff --git a/meta-extras/packages/python/python-native-2.5.1/bindir-libdir.patch b/meta-extras/packages/python/python-native-2.5.2/bindir-libdir.patch
index 999bddc449..999bddc449 100644
--- a/meta-extras/packages/python/python-native-2.5.1/bindir-libdir.patch
+++ b/meta-extras/packages/python/python-native-2.5.2/bindir-libdir.patch
diff --git a/meta-extras/packages/python/python-native-2.5.1/cross-distutils.patch b/meta-extras/packages/python/python-native-2.5.2/cross-distutils.patch
index 3356c1abbe..3356c1abbe 100644
--- a/meta-extras/packages/python/python-native-2.5.1/cross-distutils.patch
+++ b/meta-extras/packages/python/python-native-2.5.2/cross-distutils.patch
diff --git a/meta-extras/packages/python/python-native-2.5.1/default-is-optimized.patch b/meta-extras/packages/python/python-native-2.5.2/default-is-optimized.patch
index 6beeb6e022..6beeb6e022 100644
--- a/meta-extras/packages/python/python-native-2.5.1/default-is-optimized.patch
+++ b/meta-extras/packages/python/python-native-2.5.2/default-is-optimized.patch
diff --git a/meta-extras/packages/python/python-native-2.5.1/dont-modify-shebang-line.patch b/meta-extras/packages/python/python-native-2.5.2/dont-modify-shebang-line.patch
index 54109afd62..54109afd62 100644
--- a/meta-extras/packages/python/python-native-2.5.1/dont-modify-shebang-line.patch
+++ b/meta-extras/packages/python/python-native-2.5.2/dont-modify-shebang-line.patch
diff --git a/meta-extras/packages/python/python_2.5.1.bb b/meta-extras/packages/python/python_2.5.2.bb
index 63b7c368a8..1ac48f3686 100644
--- a/meta-extras/packages/python/python_2.5.1.bb
+++ b/meta-extras/packages/python/python_2.5.2.bb
@@ -5,8 +5,6 @@ SECTION = "devel/python"
5PRIORITY = "optional" 5PRIORITY = "optional"
6DEPENDS = "python-native readline zlib gdbm openssl sqlite3" 6DEPENDS = "python-native readline zlib gdbm openssl sqlite3"
7DEPENDS_sharprom = "python-native readline zlib gdbm openssl" 7DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
8
9# NOTE: Keep the digit in sync with BASEREV in contrib/generate-manifest-2.5.py
10PR = "ml1" 8PR = "ml1"
11 9
12PYTHON_MAJMIN = "2.5" 10PYTHON_MAJMIN = "2.5"
@@ -17,7 +15,9 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
17 file://fix-tkinter-detection.patch;patch=1 \ 15 file://fix-tkinter-detection.patch;patch=1 \
18 file://autohell.patch;patch=1 \ 16 file://autohell.patch;patch=1 \
19 file://sitebranding.patch;patch=1 \ 17 file://sitebranding.patch;patch=1 \
20 file://default-is-optimized.patch;patch=1" 18 file://enable-ctypes-module.patch;patch=1 \
19 file://default-is-optimized.patch;patch=1 \
20 file://sitecustomize.py"
21S = "${WORKDIR}/Python-${PV}" 21S = "${WORKDIR}/Python-${PV}"
22 22
23inherit autotools 23inherit autotools
@@ -43,21 +43,21 @@ do_compile_prepend() {
43} 43}
44 44
45do_compile() { 45do_compile() {
46 oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ 46 oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
47 HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ 47 HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
48 STAGING_LIBDIR=${STAGING_LIBDIR} \ 48 STAGING_LIBDIR=${STAGING_LIBDIR} \
49 STAGING_INCDIR=${STAGING_INCDIR} \ 49 STAGING_INCDIR=${STAGING_INCDIR} \
50 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 50 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
51 OPT="${CFLAGS}" libpython2.5.so 51 OPT="${CFLAGS}" libpython2.5.so
52 52
53 oe_libinstall -so libpython2.5 ${STAGING_LIBDIR} 53 oe_libinstall -so libpython2.5 ${STAGING_LIBDIR}
54 54
55 oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ 55 oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
56 HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ 56 HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
57 STAGING_LIBDIR=${STAGING_LIBDIR} \ 57 STAGING_LIBDIR=${STAGING_LIBDIR} \
58 STAGING_INCDIR=${STAGING_INCDIR} \ 58 STAGING_INCDIR=${STAGING_INCDIR} \
59 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 59 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
60 OPT="${CFLAGS}" 60 OPT="${CFLAGS}"
61} 61}
62 62
63do_stage() { 63do_stage() {
@@ -67,19 +67,28 @@ do_stage() {
67 67
68do_install() { 68do_install() {
69 install -m 0644 Makefile.orig Makefile 69 install -m 0644 Makefile.orig Makefile
70 oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ 70
71 HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ 71 oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
72 STAGING_LIBDIR=${STAGING_LIBDIR} \ 72 HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
73 STAGING_INCDIR=${STAGING_INCDIR} \ 73 STAGING_LIBDIR=${STAGING_LIBDIR} \
74 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 74 STAGING_INCDIR=${STAGING_INCDIR} \
75 DESTDIR=${D} LIBDIR=${libdir} install 75 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
76 DESTDIR=${D} LIBDIR=${libdir} install
77
78 install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN}
76} 79}
77 80
78require python-${PYTHON_MAJMIN}-manifest.inc 81require python-${PYTHON_MAJMIN}-manifest.inc
79 82
83# manual dependency additions
80RPROVIDES_python-core = "python" 84RPROVIDES_python-core = "python"
81RPROVIDES_python-curses = "python" 85RRECOMMENDS_python-core = "python-readline"
86RRECOMMENDS_python-crypt = "openssl"
87
88# add sitecustomize
89FILES_python-core += "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py"
82 90
91# package libpython
83PACKAGES =+ "libpython2" 92PACKAGES =+ "libpython2"
84FILES_libpython2 = "${libdir}/libpython*" 93FILES_libpython2 = "${libdir}/libpython*"
85 94