From c80831a276fe0bc9f9718ac06241b26d043eef6c Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Wed, 12 Aug 2009 10:31:58 +0200 Subject: python: add missing dependencies * Added mimetools.py and rfc822.py to python-netclient * Added python-json package * Let python-email depend on python-netclient, because email/utils.py depends on base64.py NOTE: Fixes http://trac.shr-project.org/trac/ticket/549 --- contrib/python/generate-manifest-2.6.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'contrib/python') diff --git a/contrib/python/generate-manifest-2.6.py b/contrib/python/generate-manifest-2.6.py index b75486f129..f549b6be9c 100755 --- a/contrib/python/generate-manifest-2.6.py +++ b/contrib/python/generate-manifest-2.6.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # generate Python Manifest for the OpenEmbedded build system -# (C) 2002-2008 Michael 'Mickey' Lauer +# (C) 2002-2009 Michael 'Mickey' Lauer # (C) 2007 Jeremy Laine # licensed under MIT, see COPYING.MIT @@ -12,7 +12,7 @@ import time VERSION = "2.6.1" __author__ = "Michael 'Mickey' Lauer " -__version__ = "20081214" +__version__ = "20090812" class MakefileMaker: @@ -23,7 +23,7 @@ class MakefileMaker: self.output = outfile self.out( """ # WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file. -# Generator: '%s' Version %s (C) 2002-2008 Michael 'Mickey' Lauer +# Generator: '%s' Version %s (C) 2002-2009 Michael 'Mickey' Lauer # Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy """ % ( sys.argv[0], __version__ ) ) @@ -223,7 +223,7 @@ if __name__ == "__main__": m.addPackage( "python-doctest", "Python framework for running examples in docstrings.", "python-core python-lang python-io python-re python-unittest python-debugger python-difflib", "doctest.*" ) - m.addPackage( "python-email", "Python Email Support", "python-core python-io python-re python-mime python-audio python-image", + m.addPackage( "python-email", "Python Email Support", "python-core python-io python-re python-mime python-audio python-image python-netclient", "email" ) # package m.addPackage( "python-fcntl", "Python's fcntl Interface", "python-core", @@ -245,6 +245,9 @@ if __name__ == "__main__": "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-json", "Python JSON Support", "python-core python-math python-re", + "json" ) # package + m.addPackage( "python-lang", "Python Low-Level Language Support", "python-core", "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 " + @@ -271,7 +274,7 @@ if __name__ == "__main__": m.addPackage( "python-netclient", "Python Internet Protocol Clients", "python-core python-crypt python-datetime python-io python-lang python-logging python-mime", "*Cookie*.* " + - "base64.* cookielib.* ftplib.* gopherlib.* hmac.* httplib.* mimetypes.* nntplib.* poplib.* smtplib.* telnetlib.* urllib.* urllib2.* urlparse.* uuid.*" ) + "base64.* cookielib.* ftplib.* gopherlib.* hmac.* httplib.* mimetypes.* nntplib.* poplib.* smtplib.* telnetlib.* urllib.* urllib2.* urlparse.* uuid.* rfc822.* mimetools.*" ) m.addPackage( "python-netserver", "Python Internet Protocol Servers", "python-core python-netclient", "cgi.* BaseHTTPServer.* SimpleHTTPServer.* SocketServer.*" ) -- cgit v1.2.3 From ee14422b23949fa59555d86be8f12386dc5ae827 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Wed, 12 Aug 2009 11:24:23 +0200 Subject: python: merge some improvements done in various oe.dev-boycott branches back into oe.dev --- contrib/python/generate-manifest-2.6.py | 40 +++++++++++++++++---------------- 1 file changed, 21 insertions(+), 19 deletions(-) (limited to 'contrib/python') diff --git a/contrib/python/generate-manifest-2.6.py b/contrib/python/generate-manifest-2.6.py index f549b6be9c..d6fdcb456f 100755 --- a/contrib/python/generate-manifest-2.6.py +++ b/contrib/python/generate-manifest-2.6.py @@ -9,7 +9,7 @@ import os import sys import time -VERSION = "2.6.1" +VERSION = "2.6.2" __author__ = "Michael 'Mickey' Lauer " __version__ = "20090812" @@ -191,7 +191,7 @@ if __name__ == "__main__": "compiler" ) # package m.addPackage( "python-compression", "Python High Level Compression Support", "python-core python-zlib", - "gzip.* zipfile.* tarfile.*" ) + "gzip.* zipfile.* tarfile.* lib-dynload/bz2.so" ) m.addPackage( "python-crypt", "Python Basic Cryptographic and Hashing Support", "python-core", "hashlib.* md5.* sha.* lib-dynload/crypt.so lib-dynload/_hashlib.so lib-dynload/_sha256.so lib-dynload/_sha512.so" ) @@ -223,8 +223,12 @@ if __name__ == "__main__": m.addPackage( "python-doctest", "Python framework for running examples in docstrings.", "python-core python-lang python-io python-re python-unittest python-debugger python-difflib", "doctest.*" ) + # FIXME consider adding to some higher level package + m.addPackage( "python-elementtree", "Python elementree", "python-core", + "lib-dynload/_elementtree.so" ) + m.addPackage( "python-email", "Python Email Support", "python-core python-io python-re python-mime python-audio python-image python-netclient", - "email" ) # package + "imaplib.* email" ) # package m.addPackage( "python-fcntl", "Python's fcntl Interface", "python-core", "lib-dynload/fcntl.so" ) @@ -257,8 +261,8 @@ if __name__ == "__main__": m.addPackage( "python-logging", "Python Logging Support", "python-core python-io python-lang python-pickle python-stringold", "logging" ) # package - m.addPackage( "python-tkinter", "Python Tcl/Tk Bindings", "python-core", - "lib-dynload/_tkinter.so lib-tk" ) # package + m.addPackage( "python-mailbox", "Python Mailbox Format Support", "python-core python-mime", + "mailbox.*" ) m.addPackage( "python-math", "Python Math Support", "python-core", "lib-dynload/cmath.so lib-dynload/math.so lib-dynload/_random.so random.* sets.*" ) @@ -268,9 +272,9 @@ if __name__ == "__main__": m.addPackage( "python-mmap", "Python Memory-Mapped-File Support", "python-core python-io", "lib-dynload/mmap.so " ) - - m.addPackage( "python-unixadmin", "Python Unix Administration Support", "python-core", - "lib-dynload/nis.so lib-dynload/grp.so lib-dynload/pwd.so getpass.*" ) + + m.addPackage( "python-multiprocessing", "Python Multiprocessing Support", "python-core python-io python-lang", + "lib-dynload/_multiprocessing.so multiprocessing" ) # package m.addPackage( "python-netclient", "Python Internet Protocol Clients", "python-core python-crypt python-datetime python-io python-lang python-logging python-mime", "*Cookie*.* " + @@ -310,7 +314,7 @@ if __name__ == "__main__": "subprocess.*" ) m.addPackage( "python-sqlite3", "Python Sqlite3 Database Support", "python-core python-datetime python-lang python-crypt python-io python-threading python-zlib", - "lib-dynload/_sqlite3.so sqlite3/dbapi2.* sqlite3/__init__.*" ) + "lib-dynload/_sqlite3.so sqlite3/dbapi2.* sqlite3/__init__.* sqlite3/dump.*" ) m.addPackage( "python-sqlite3-tests", "Python Sqlite3 Database Support Tests", "python-core python-sqlite3", "sqlite3/test" ) @@ -318,7 +322,7 @@ if __name__ == "__main__": m.addPackage( "python-stringold", "Python String APIs [deprecated]", "python-core python-re", "lib-dynload/strop.so string.*" ) - m.addPackage( "python-syslog", "Python's Syslog Interface", "python-core", + m.addPackage( "python-syslog", "Python Syslog Interface", "python-core", "lib-dynload/syslog.so" ) m.addPackage( "python-terminal", "Python Terminal Controlling Support", "python-core python-io", @@ -329,10 +333,16 @@ if __name__ == "__main__": m.addPackage( "python-threading", "Python Threading & Synchronization Support", "python-core python-lang", "_threading_local.* dummy_thread.* dummy_threading.* mutex.* threading.* Queue.*" ) - + + m.addPackage( "python-tkinter", "Python Tcl/Tk Bindings", "python-core", + "lib-dynload/_tkinter.so lib-tk" ) # package + m.addPackage( "python-unittest", "Python Unit Testing Framework", "python-core python-stringold python-lang", "unittest.*" ) + m.addPackage( "python-unixadmin", "Python Unix Administration Support", "python-core", + "lib-dynload/nis.so lib-dynload/grp.so lib-dynload/pwd.so getpass.*" ) + m.addPackage( "python-xml", "Python basic XML support.", "python-core python-re", "lib-dynload/pyexpat.so xml xmllib.*" ) # package @@ -345,12 +355,4 @@ if __name__ == "__main__": m.addPackage( "python-mailbox", "Python Mailbox Format Support", "python-core python-mime", "mailbox.*" ) - # FIXME consider adding to python-compression - m.addPackage( "python-bzip2", "Python bzip2 support", "python-core", - "lib-dynload/bz2.so" ) - - # FIXME consider adding to some higher level package - m.addPackage( "python-elementtree", "Python elementree", "python-core", - "lib-dynload/_elementtree.so" ) - m.make() -- cgit v1.2.3