7 files changed, 33 insertions, 21 deletions
diff --git a/meta-extras/packages/python/python-2.4.3-manifest.inc b/meta-extras/packages/python/python-2.4.4-manifest.inc
index 0178d4e186..35017aefe7 100644
--- a/meta-extras/packages/python/python-2.4.3-manifest.inc
+++ b/meta-extras/packages/python/python-2.4.4-manifest.inc
@@ -1,5 +1,5 @@
 ########################################################################################################################
-### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Thu Mar 30 17:39:30 2006
+### AUTO-GENERATED by '/local/pkg/oe/org.openembedded.dev/contrib/python/generate-manifest.py' [(C) 2002-2007 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Mon Dec 25 00:05:05 2006
 ###
 ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
 ###
@@ -8,12 +8,19 @@
 ########################################################################################################################
 
-PACKAGES="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-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
+PROVIDES+="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-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
+PACKAGES="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-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio "
+DESCRIPTION_python-profile="Python Basic Profiling Support"
+PR_python-profile="ml0"
+RDEPENDS_python-profile="python-core"
+FILES_python-profile="${libdir}/python2.4/profile.* ${libdir}/python2.4/pstats.* "
 DESCRIPTION_python-threading="Python Threading & Synchronization Support"
 PR_python-threading="ml0"
 RDEPENDS_python-threading="python-core python-lang"
-FILES_python-threading="${libdir}/python2.4/_threading_local.* ${libdir}/python2.4/bisect.* ${libdir}/python2.4/dummy_thread.* ${libdir}/python2.4/dummy_threading.* ${libdir}/python2.4/mutex.* ${libdir}/python2.4/threading.* ${libdir}/python2.4/Queue.* "
+FILES_python-threading="${libdir}/python2.4/_threading_local.* ${libdir}/python2.4/dummy_thread.* ${libdir}/python2.4/dummy_threading.* ${libdir}/python2.4/mutex.* ${libdir}/python2.4/threading.* ${libdir}/python2.4/Queue.* "
 DESCRIPTION_python-distutils="Python Distribution Utilities"
 PR_python-distutils="ml0"
@@ -32,7 +39,7 @@ FILES_python-codecs="${libdir}/python2.4/codecs.* ${libdir}/python2.4/encodings
 DESCRIPTION_python-pickle="Python Persistence Support"
 PR_python-pickle="ml0"
-RDEPENDS_python-pickle="python-core python-codecs python-re"
+RDEPENDS_python-pickle="python-core python-codecs python-io python-re"
 FILES_python-pickle="${libdir}/python2.4/pickle.* ${libdir}/python2.4/shelve.* ${libdir}/python2.4/lib-dynload/cPickle.so "
 DESCRIPTION_python-datetime="Python Calendar and Time support"
@@ -43,7 +50,7 @@ FILES_python-datetime="${libdir}/python2.4/_strptime.* ${libdir}/python2.4/calen
 DESCRIPTION_python-core="Python Interpreter and core modules (needed!)"
 PR_python-core="ml0"
 RDEPENDS_python-core=""
-FILES_python-core="/usr/lib/python2.4/__future__.* /usr/lib/python2.4/copy.* /usr/lib/python2.4/copy_reg.* /usr/lib/python2.4/ConfigParser.py /usr/lib/python2.4/getopt.* /usr/lib/python2.4/linecache.* /usr/lib/python2.4/new.* /usr/lib/python2.4/os.* /usr/lib/python2.4/posixpath.* /usr/lib/python2.4/warnings.* /usr/lib/python2.4/site.* /usr/lib/python2.4/stat.* /usr/lib/python2.4/UserDict.* /usr/lib/python2.4/lib-dynload/binascii.so /usr/lib/python2.4/lib-dynload/struct.so /usr/lib/python2.4/lib-dynload/time.so /usr/lib/python2.4/lib-dynload/xreadlines.so /usr/lib/python2.4/types.* /usr/bin/python "
+FILES_python-core="/usr/lib/python2.4/__future__.* /usr/lib/python2.4/copy.* /usr/lib/python2.4/copy_reg.* /usr/lib/python2.4/ConfigParser.py /usr/lib/python2.4/getopt.* /usr/lib/python2.4/linecache.* /usr/lib/python2.4/new.* /usr/lib/python2.4/os.* /usr/lib/python2.4/posixpath.* /usr/lib/python2.4/warnings.* /usr/lib/python2.4/site.* /usr/lib/python2.4/stat.* /usr/lib/python2.4/UserDict.* /usr/lib/python2.4/UserList.* /usr/lib/python2.4/UserString.* /usr/lib/python2.4/lib-dynload/binascii.so /usr/lib/python2.4/lib-dynload/struct.so /usr/lib/python2.4/lib-dynload/time.so /usr/lib/python2.4/lib-dynload/xreadlines.so /usr/lib/python2.4/types.* /usr/bin/python "
 DESCRIPTION_python-io="Python Low-Level I/O"
 PR_python-io="ml0"
@@ -117,7 +124,7 @@ FILES_python-tkinter="${libdir}/python2.4/lib-dynload/_tkinter.so ${libdir}/pyth
 DESCRIPTION_python-gdbm="Python GNU Database Support"
 PR_python-gdbm="ml0"
-RDEPENDS_python-gdbm="python-core libgdbm3"
+RDEPENDS_python-gdbm="python-core"
 FILES_python-gdbm="${libdir}/python2.4/lib-dynload/gdbm.so "
 DESCRIPTION_python-fcntl="Python's fcntl Interface"
@@ -128,7 +135,7 @@ FILES_python-fcntl="${libdir}/python2.4/lib-dynload/fcntl.so "
 DESCRIPTION_python-netclient="Python Internet Protocol Clients"
 PR_python-netclient="ml0"
 RDEPENDS_python-netclient="python-core python-datetime python-io python-lang python-logging python-mime"
-FILES_python-netclient="${libdir}/python2.4/_LWPCookieJar.* ${libdir}/python2.4/_MozillaCookieJar.* ${libdir}/python2.4/base64.* ${libdir}/python2.4/cookielib.* ${libdir}/python2.4/ftplib.* ${libdir}/python2.4/gopherlib.* ${libdir}/python2.4/hmac.* ${libdir}/python2.4/httplib.* ${libdir}/python2.4/mimetypes.* ${libdir}/python2.4/nntplib.* ${libdir}/python2.4/poplib.* ${libdir}/python2.4/smtplib.* ${libdir}/python2.4/telnetlib.* ${libdir}/python2.4/urllib.* ${libdir}/python2.4/urllib2.* ${libdir}/python2.4/urlparse.* "
+FILES_python-netclient="${libdir}/python2.4/*Cookie*.* ${libdir}/python2.4/base64.* ${libdir}/python2.4/cookielib.* ${libdir}/python2.4/ftplib.* ${libdir}/python2.4/gopherlib.* ${libdir}/python2.4/hmac.* ${libdir}/python2.4/httplib.* ${libdir}/python2.4/mimetypes.* ${libdir}/python2.4/nntplib.* ${libdir}/python2.4/poplib.* ${libdir}/python2.4/smtplib.* ${libdir}/python2.4/telnetlib.* ${libdir}/python2.4/urllib.* ${libdir}/python2.4/urllib2.* ${libdir}/python2.4/urlparse.* "
 DESCRIPTION_python-pprint="Python Pretty-Print Support"
 PR_python-pprint="ml0"
@@ -142,7 +149,7 @@ FILES_python-netserver="${libdir}/python2.4/cgi.* ${libdir}/python2.4/BaseHTTPSe
 DESCRIPTION_python-curses="Python Curses Support"
 PR_python-curses="ml0"
-RDEPENDS_python-curses="python-core libncurses5"
+RDEPENDS_python-curses="python-core"
 FILES_python-curses="${libdir}/python2.4/curses ${libdir}/python2.4/lib-dynload/_curses.so ${libdir}/python2.4/lib-dynload/_curses_panel.so "
 DESCRIPTION_python-syslog="Python's syslog Interface"
@@ -157,9 +164,14 @@ FILES_python-html="${libdir}/python2.4/formatter.* ${libdir}/python2.4/htmlentit
 DESCRIPTION_python-readline="Python Readline Support"
 PR_python-readline="ml0"
-RDEPENDS_python-readline="python-core libreadline4"
+RDEPENDS_python-readline="python-core"
 FILES_python-readline="${libdir}/python2.4/lib-dynload/readline.so ${libdir}/python2.4/rlcompleter.* "
+DESCRIPTION_python-subprocess="Python Subprocess Support"
+PR_python-subprocess="ml0"
+RDEPENDS_python-subprocess="python-core python-io python-re"
+FILES_python-subprocess="${libdir}/python2.4/subprocess.* "
 DESCRIPTION_python-pydoc="Python Interactive Help Support"
 PR_python-pydoc="ml0"
 RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re"
@@ -195,7 +207,7 @@ PR_python-unittest="ml0"
 RDEPENDS_python-unittest="python-core python-stringold python-lang"
 FILES_python-unittest="${libdir}/python2.4/unittest.* "
-DESCRIPTION_python-stringold="Python Deprecated String APIs"
+DESCRIPTION_python-stringold="Python String APIs [deprecated]"
 PR_python-stringold="ml0"
 RDEPENDS_python-stringold="python-core python-re"
 FILES_python-stringold="${libdir}/python2.4/lib-dynload/strop.so ${libdir}/python2.4/string.* "
@@ -227,7 +239,7 @@ FILES_python-mmap="${libdir}/python2.4/lib-dynload/mmap.so "
 DESCRIPTION_python-zlib="Python zlib Support."
 PR_python-zlib="ml0"
-RDEPENDS_python-zlib="python-core libz1"
+RDEPENDS_python-zlib="python-core"
 FILES_python-zlib="${libdir}/python2.4/lib-dynload/zlib.so "
 DESCRIPTION_python-db="Python File-Based Database Support"
@@ -248,7 +260,7 @@ FILES_python-idle="/usr/bin/idle /usr/lib/python2.4/idlelib "
 DESCRIPTION_python-lang="Python Low-Level Language Support"
 PR_python-lang="ml0"
 RDEPENDS_python-lang="python-core"
-FILES_python-lang="${libdir}/python2.4/lib-dynload/array.so ${libdir}/python2.4/lib-dynload/parser.so ${libdir}/python2.4/lib-dynload/operator.so ${libdir}/python2.4/lib-dynload/_weakref.so ${libdir}/python2.4/lib-dynload/itertools.so ${libdir}/python2.4/lib-dynload/collections.so ${libdir}/python2.4/atexit.* ${libdir}/python2.4/code.* ${libdir}/python2.4/codeop.* ${libdir}/python2.4/dis.* ${libdir}/python2.4/inspect.* ${libdir}/python2.4/keyword.* ${libdir}/python2.4/opcode.* ${libdir}/python2.4/repr.* ${libdir}/python2.4/token.* ${libdir}/python2.4/tokenize.* ${libdir}/python2.4/traceback.* ${libdir}/python2.4/linecache.* ${libdir}/python2.4/weakref.* "
+FILES_python-lang="${libdir}/python2.4/lib-dynload/array.so ${libdir}/python2.4/lib-dynload/parser.so ${libdir}/python2.4/lib-dynload/operator.so ${libdir}/python2.4/lib-dynload/_weakref.so ${libdir}/python2.4/lib-dynload/itertools.so ${libdir}/python2.4/lib-dynload/collections.so ${libdir}/python2.4/lib-dynload/_bisect.so ${libdir}/python2.4/lib-dynload/_heapq.so ${libdir}/python2.4/atexit.* ${libdir}/python2.4/bisect.* ${libdir}/python2.4/code.* ${libdir}/python2.4/codeop.* ${libdir}/python2.4/dis.* ${libdir}/python2.4/heapq.* ${libdir}/python2.4/inspect.* ${libdir}/python2.4/keyword.* ${libdir}/python2.4/opcode.* ${libdir}/python2.4/repr.* ${libdir}/python2.4/token.* ${libdir}/python2.4/tokenize.* ${libdir}/python2.4/traceback.* ${libdir}/python2.4/linecache.* ${libdir}/python2.4/weakref.* "
 DESCRIPTION_python-audio="Python Audio Handling"
 PR_python-audio="ml0"
diff --git a/meta-extras/packages/python/python-2.4.3/autohell.patch b/meta-extras/packages/python/python-2.4.4/autohell.patch
index b0eebb9ce8..b0eebb9ce8 100644
--- a/meta-extras/packages/python/python-2.4.3/autohell.patch
+++ b/meta-extras/packages/python/python-2.4.4/autohell.patch
diff --git a/meta-extras/packages/python/python-2.4.3/bindir-libdir.patch b/meta-extras/packages/python/python-2.4.4/bindir-libdir.patch
index 27ae5dce5b..27ae5dce5b 100644
--- a/meta-extras/packages/python/python-2.4.3/bindir-libdir.patch
+++ b/meta-extras/packages/python/python-2.4.4/bindir-libdir.patch
diff --git a/meta-extras/packages/python/python-2.4.3/crosscompile.patch b/meta-extras/packages/python/python-2.4.4/crosscompile.patch
index f917bb2567..f917bb2567 100644
--- a/meta-extras/packages/python/python-2.4.3/crosscompile.patch
+++ b/meta-extras/packages/python/python-2.4.4/crosscompile.patch
diff --git a/meta-extras/packages/python/python-2.4.3/fix-tkinter-detection.patch b/meta-extras/packages/python/python-2.4.4/fix-tkinter-detection.patch
index 602aa8e021..602aa8e021 100644
--- a/meta-extras/packages/python/python-2.4.3/fix-tkinter-detection.patch
+++ b/meta-extras/packages/python/python-2.4.4/fix-tkinter-detection.patch
diff --git a/meta-extras/packages/python/python-2.4.3/sitebranding.patch b/meta-extras/packages/python/python-2.4.4/sitebranding.patch
index 85bb83a506..85bb83a506 100644
--- a/meta-extras/packages/python/python-2.4.3/sitebranding.patch
+++ b/meta-extras/packages/python/python-2.4.4/sitebranding.patch
diff --git a/meta-extras/packages/python/python_2.4.3.bb b/meta-extras/packages/python/python_2.4.4.bb
index 30ce73abe2..962646833b 100644
--- a/meta-extras/packages/python/python_2.4.3.bb
+++ b/meta-extras/packages/python/python_2.4.4.bb
@@ -3,10 +3,9 @@ HOMEPAGE = "http://www.python.org"
 LICENSE = "PSF"
 SECTION = "devel/python"
 PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+DEPENDS = "python-native readline zlib gdbm openssl"
-DEPENDS = "python-native readline zlib gdbm openssl tcl tk"
 DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
-PR = "ml3"
+PR = "ml0"
 PYTHON_MAJMIN = "2.4"
@@ -40,11 +39,12 @@ do_compile_prepend() {
 }
 do_compile() {
-        oe_runmake HOSTPGEN=${STAGING_BINDIR}/pgen \
+        oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
-                   HOSTPYTHON=${STAGING_BINDIR}/python \
+                   HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
                   STAGING_LIBDIR=${STAGING_LIBDIR} \
                   STAGING_INCDIR=${STAGING_INCDIR} \
-                   BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS}
+                   BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+                   OPT="${CFLAGS}"
 }
 do_stage() {
@@ -54,15 +54,15 @@ do_stage() {
 do_install() {
        install -m 0644 Makefile.orig Makefile
-        oe_runmake HOSTPGEN=${STAGING_BINDIR}/pgen \
+        oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
-                   HOSTPYTHON=${STAGING_BINDIR}/python \
+                   HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
                   STAGING_LIBDIR=${STAGING_LIBDIR} \
                   STAGING_INCDIR=${STAGING_INCDIR} \
                   BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
                   DESTDIR=${D} install
 }
-include python-${PV}-manifest.inc
+require python-${PV}-manifest.inc
 RPROVIDES_python-core = "python"
 RPROVIDES_python-curses = "python"