From 5855ee2bfcfe65a2e57723d1fcd299a1c86685cf Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 25 Aug 2006 12:50:17 +0000 Subject: libvncserver: depends on libxext --- packages/libvncserver/libvncserver_0.8.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/libvncserver/libvncserver_0.8.2.bb b/packages/libvncserver/libvncserver_0.8.2.bb index 480a888745..8ceec7e62a 100644 --- a/packages/libvncserver/libvncserver_0.8.2.bb +++ b/packages/libvncserver/libvncserver_0.8.2.bb @@ -6,7 +6,7 @@ MAINTAINER = "Patrik Gfeller " SECTION = "libs" PRIORITY = "optional" PROVIDES = "x11vnc" -DEPENDS = "virtual/libsdl virtual/libx11 zlib jpeg" +DEPENDS = "virtual/libsdl virtual/libx11 zlib jpeg libxext" PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/LibVNCServer-${PV}.tar.gz;md5sum=17a18e398af6c1730f72068022a152aa" -- cgit v1.2.3 From 06d323b74ee2c9c83684bbafd7b8362525e82ae2 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 25 Aug 2006 12:56:23 +0000 Subject: contrib/python: add the script that I use to generate the python manifest file --- contrib/python/.mtn2git_empty | 0 contrib/python/generate-manifest.py | 278 ++++++++++++++++++++++++++++++++++++ 2 files changed, 278 insertions(+) create mode 100644 contrib/python/.mtn2git_empty create mode 100755 contrib/python/generate-manifest.py diff --git a/contrib/python/.mtn2git_empty b/contrib/python/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/contrib/python/generate-manifest.py b/contrib/python/generate-manifest.py new file mode 100755 index 0000000000..9eb3522682 --- /dev/null +++ b/contrib/python/generate-manifest.py @@ -0,0 +1,278 @@ +#!/usr/bin/env python + +# generate Python Manifest for the OpenEmbedded build system +# (C) 2002-2006 Michael Lauer +# MIT license + +import os +import sys +import time + +# major version +VERSION = "2.4.0" +# increase when touching python-core +BASEREV = 1 + +__author__ = "Michael 'Mickey' Lauer " +__version__ = "$Revision: 1.6 $" + +class MakefileMaker: + + def __init__( self, outfile ): + """initialize""" + self.packages = {} + self.sourcePrefix = "/lib/python%s/" % VERSION[:3] + self.targetPrefix = "${libdir}/python%s" % VERSION[:3] + self.output = outfile + self.out( "### AUTO-GENERATED by '%s' [(C) 2002-2006 Michael Lauer] on %s" % ( sys.argv[0], time.asctime() ) ) + self.out( "###" ) + self.out( "### Warning: Manual edits will be lost!" ) + self.out( "###" ) + # + # helper functions + # + + def out( self, data ): + """print a line to the output file""" + print >> self.output, data + + def setPrefix( self, sourcePrefix, targetPrefix ): + """set a file prefix for addPackage files""" + self.sourcePrefix = sourcePrefix + self.targetPrefix = targetPrefix + + def doProlog( self ): + self.out( """ """ ) + self.out( "" ) + + def addPackage( self, revision, name, description, dependencies, filenames ): + """add a package to the Makefile""" + if type( filenames ) == type( "" ): + filenames = filenames.split() + fullFilenames = [] + for filename in filenames: + if filename[0] != "/": + fullFilenames.append( ( "%s%s" % ( self.sourcePrefix, filename ), "%s%s" % ( self.targetPrefix, filename ) ) ) + else: + fullFilenames.append( ( filename, filename ) ) + self.packages[name] = revision, description, dependencies, fullFilenames + + def doBody( self ): + """generate body of Makefile""" + + global VERSION + + # + # generate package line + # + + packageLine = 'PACKAGES="' + for name in self.packages: + packageLine += "%s " % name + packageLine += '"' + + self.out( packageLine ) + self.out( "" ) + + # + # generate package variables + # + + for name, data in self.packages.iteritems(): + rev, desc, deps, files = data + + # + # write out the description, revision and dependencies + # + self.out( 'DESCRIPTION_%s="%s"' % ( name, desc ) ) + self.out( 'PR_%s="ml%d"' % ( name, rev + BASEREV ) ) + self.out( 'RDEPENDS_%s="%s"' % ( name, deps.replace( ",", "" ) ) ) + + line = 'FILES_%s="' % name + + # + # check which directories to make in the temporary directory + # + + dirset = {} # if python had a set-datatype this would be sufficient. for now, we're using a dict instead. + for source, target in files: + dirset[os.path.dirname( target )] = True + + # + # generate which files to copy for the target (-dfR because whole directories are also allowed) + # + + for source, target in files: + line += "%s " % target + + line += '"' + self.out( line ) + +# for source, target in files: +# if ( source.find( "lib-dynload" ) != -1 ) or \ +# ( source.endswith( "python" ) ) or \ +# ( source.endswith( "pydoc" ) ): # MACHDEP +# self.out( "\t cp -dfR $(STAGING_LIBDIR)/..%s $(IPKTMP_DIR)%s/;" % ( source, os.path.dirname( target ) ) ) +# else: +# self.out( "\t cp -dfR $(STAGING_DIR)%s $(IPKTMP_DIR)%s/;" % ( source, os.path.dirname( target ) ) ) +# + self.out( "" ) + + def doEpilog( self ): + self.out( """""" ) + self.out( "" ) + + def make( self ): + self.doProlog() + self.doBody() + self.doEpilog() + +if __name__ == "__main__": + + if len( sys.argv ) > 1: + os.popen( "rm -f ./%s" % sys.argv[1] ) + outfile = file( sys.argv[1], "w" ) + else: + outfile = sys.stdout + + m = MakefileMaker( outfile ) + + # Add packages here. + # Note: Only supply dlopen link library dependencies here. Aautomatic link libraries are getting added by the shlibs dependency code + + m.setPrefix( "/", "/usr/" ) + + m.addPackage( 1, "python-core", "Python Interpreter and core modules (needed!)", "", + "lib/python2.4/__future__.* lib/python2.4/copy.* lib/python2.4/copy_reg.* lib/python2.4/ConfigParser.py " + + "lib/python2.4/getopt.* lib/python2.4/new.* " + + "lib/python2.4/os.* lib/python2.4/posixpath.* "+ + "lib/python2.4/warnings.* lib/python2.4/site.* lib/python2.4/stat.* lib/python2.4/UserDict.* " + + "lib/python2.4/lib-dynload/binascii.so lib/python2.4/lib-dynload/struct.so lib/python2.4/lib-dynload/time.so " + + "lib/python2.4/lib-dynload/xreadlines.so lib/python2.4/types.* bin/python" ) + + m.addPackage( 1, "python-pydoc", "Python Interactive Help Support", "python-core, python-lang, python-stringold, python-re", + "bin/pydoc lib/python2.4/pydoc.*" ) + + m.setPrefix( "/lib/python2.4/", "${libdir}/python2.4/" ) + + m.addPackage( 1, "python-audio", "Python Audio Handling", "python-core", + "wave.* chunk.* lib-dynload/ossaudiodev.so lib-dynload/audioop.so" ) + + m.addPackage( 1, "python-codecs", "Python Codecs, Encodings & i18n Support", "python-core", + "codecs.* encodings locale.* lib-dynload/_locale.so lib-dynload/unicodedata.so gettext.* xdrlib.*" ) + + m.addPackage( 1, "python-compile", "Python Bytecode Compilation Support", "python-core", + "py_compile.* compileall.*" ) + + m.addPackage( 1, "python-compiler", "Python Compiler Support", "python-core", + "compiler" ) # package + + m.addPackage( 1, "python-compression", "Python High Level Compression Support", "python-core, python-zlib", + "gzip.* zipfile.*" ) + + m.addPackage( 1, "python-crypt", "Python Basic Cryptographic and Hashing Support", "python-core", + "lib-dynload/crypt.so lib-dynload/md5.so lib-dynload/rotor.so lib-dynload/sha.so" ) + + m.addPackage( 1, "python-textutils", "Python Option Parsing, Text Wrapping and Comma-Separated-Value Support", "python-core, python-io, python-re, python-stringold", + "lib-dynload/_csv.so csv.* optparse.* textwrap.*" ) + + m.addPackage( 1, "python-curses", "Python Curses Support", "python-core", + "curses lib-dynload/_curses.so lib-dynload/_curses_panel.so" ) # package + + m.addPackage( 1, "python-db", "Python File-Based Database Support", "python-core", + "anydbm.* dumbdbm.* whichdb.* " ) + + m.addPackage( 1, "python-distutils", "Python Distribution Utility", "python-core", + "distutils" ) # package + + m.addPackage( 1, "python-email", "Python Email Support", "python-core, python-io, python-re", + "email" ) # package + + m.addPackage( 1, "python-fcntl", "Python's fcntl Interface", "python-core", + "lib-dynload/fcntl.so" ) + + m.addPackage( 1, "python-hotshot", "Python Hotshot Profiler", "python-core", + "hotshot lib-dynload/_hotshot.so" ) + + m.addPackage( 1, "python-html", "Python HTML Processing", "python-core", + "formatter.* htmlentitydefs.* htmllib.* markupbase.* sgmllib.* " ) + + m.addPackage( 1, "python-gdbm", "Python GNU Database Support", "python-core, libgdbm3", + "lib-dynload/gdbm.so" ) + + m.addPackage( 1, "python-image", "Python Graphical Image Handling", "python-core", + "colorsys.* imghdr.* lib-dynload/imageop.so lib-dynload/rgbimg.so" ) + + m.addPackage( 1, "python-io", "Python Low-Level I/O", "python-core, python-math", + "lib-dynload/_socket.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so pipes.* socket.* tempfile.* StringIO.* " ) + + m.addPackage( 2, "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 " + + "atexit.* code.* codeop.* dis.* inspect.* keyword.* opcode.* repr.* token.* tokenize.* traceback.* linecache.* weakref.*" ) + + m.addPackage( 2, "python-math", "Python Math Support", "python-core", + "lib-dynload/cmath.so lib-dynload/math.so lib-dynload/_random.so random.* sets.*" ) + + m.addPackage( 1, "python-mime", "Python MIME Handling APIs", "python-core, python-io", + "mimetools.* rfc822.*" ) + + m.addPackage( 1, "python-mmap", "Python Memory-Mapped-File Support", "python-core, python-io", + "lib-dynload/mmap.so " ) + + m.addPackage( 1, "python-unixadmin", "Python Unix Administration Support", "python-core", + "lib-dynload/nis.so lib-dynload/grp.so lib-dynload/pwd.so getpass.*" ) + + m.addPackage( 1, "python-netclient", "Python Internet Protocol Clients", "python-core, python-io, python-mime", + "base64.* ftplib.* gopherlib.* hmac.* httplib.* mimetypes.* nntplib.* poplib.* smtplib.* telnetlib.* urllib.* urllib2.* urlparse.*" ) + + m.addPackage( 1, "python-netserver", "Python Internet Protocol Servers", "python-core, python-netclient", + "cgi.* BaseHTTPServer.* SimpleHTTPServer.* SocketServer.*" ) + + m.addPackage( 1, "python-pickle", "Python Persistence Support", "python-core, python-re", + "pickle.* shelve.* lib-dynload/cPickle.so" ) + + m.addPackage( 1, "python-pprint", "Python Pretty-Print Support", "python-core", + "pprint.*" ) + + # python-pyqt has its own subdirectory + + # python-pyxml has its own subdirectory + + m.addPackage( 1, "python-re", "Python Regular Expression APIs", "python-core, python-stringold", + "re.* sre.* sre_compile.* sre_constants* sre_parse.*" ) # _sre is builtin + + m.addPackage( 1, "python-readline", "Python Readline Support", "python-core, libreadline4", + "lib-dynload/readline.so rlcompleter.*" ) + + m.addPackage( 1, "python-resource", "Python Resource Control Interface", "python-core", + "lib-dynload/resource.so" ) + + m.addPackage( 1, "python-shell", "Python Shell-Like Functionality", "python-core, python-re", + "commands.* dircache.* fnmatch.* glob.* popen2.* shutil.*" ) + + m.addPackage( 1, "python-stringold", "Python Deprecated String APIs", "python-core", + "lib-dynload/strop.so string.*" ) + + m.addPackage( 1, "python-syslog", "Python's syslog Interface", "python-core", + "lib-dynload/syslog.so" ) + + m.addPackage( 1, "python-terminal", "Python Terminal Controlling Support", "python-core, python-io", + "pty.* tty.*" ) + + m.addPackage( 1, "python-threading", "Python Threading & Synchronization Support", "python-core, python-lang", + "bisect.* threading.* Queue.*" ) + + m.addPackage( 1, "python-unittest", "Python Unit Testing Framework", "python-core, python-stringold, python-lang", + "unittest.*" ) + + m.addPackage( 1, "python-xml", "Python basic XML support.", "python-core, python-re", + "lib-dynload/pyexpat.so xml xmllib.*" ) # package + + m.addPackage( 1, "python-xmlrpc", "Python XMLRPC Support", "python-core, python-xml, python-netserver, python-lang", + "xmlrpclib.* SimpleXMLRPCServer.*" ) + + m.addPackage( 2, "python-zlib", "Python zlib Support.", "python-core, libz1", + "lib-dynload/zlib.so" ) + + m.make() -- cgit v1.2.3 From e14eeb8bf649ac2479ccd1a5181b0e27c06ed8e2 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 25 Aug 2006 13:02:44 +0000 Subject: contrib/python/generate-manifest.py: update to latest version --- contrib/python/generate-manifest.py | 162 +++++++++++++++++++++++------------- 1 file changed, 105 insertions(+), 57 deletions(-) diff --git a/contrib/python/generate-manifest.py b/contrib/python/generate-manifest.py index 9eb3522682..2fd681dc01 100755 --- a/contrib/python/generate-manifest.py +++ b/contrib/python/generate-manifest.py @@ -8,13 +8,12 @@ import os import sys import time -# major version -VERSION = "2.4.0" +VERSION = "2.4.3" # increase when touching python-core -BASEREV = 1 +BASEREV = 0 __author__ = "Michael 'Mickey' Lauer " -__version__ = "$Revision: 1.6 $" +__version__ = "$Revision: 1.20 $" class MakefileMaker: @@ -24,10 +23,14 @@ class MakefileMaker: self.sourcePrefix = "/lib/python%s/" % VERSION[:3] self.targetPrefix = "${libdir}/python%s" % VERSION[:3] self.output = outfile - self.out( "### AUTO-GENERATED by '%s' [(C) 2002-2006 Michael Lauer] on %s" % ( sys.argv[0], time.asctime() ) ) + self.out( "#" * 120 ) + self.out( "### AUTO-GENERATED by '%s' [(C) 2002-2006 Michael 'Mickey' Lauer ] on %s" % ( sys.argv[0], time.asctime() ) ) + self.out( "###" ) + self.out( "### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy" ) self.out( "###" ) self.out( "### Warning: Manual edits will be lost!" ) self.out( "###" ) + self.out( "#" * 120 ) # # helper functions # @@ -62,6 +65,18 @@ class MakefileMaker: global VERSION + # + # generate provides line + # + + provideLine = 'PROVIDES+="' + for name in self.packages: + provideLine += "%s " % name + provideLine += '"' + + self.out( provideLine ) + self.out( "" ) + # # generate package line # @@ -137,142 +152,175 @@ if __name__ == "__main__": m = MakefileMaker( outfile ) - # Add packages here. - # Note: Only supply dlopen link library dependencies here. Aautomatic link libraries are getting added by the shlibs dependency code + # Add packages here. Only specify dlopen-style library dependencies here, no ldd-style dependencies! + # Parameters: revision, name, description, dependencies, filenames + # m.setPrefix( "/", "/usr/" ) m.addPackage( 1, "python-core", "Python Interpreter and core modules (needed!)", "", "lib/python2.4/__future__.* lib/python2.4/copy.* lib/python2.4/copy_reg.* lib/python2.4/ConfigParser.py " + - "lib/python2.4/getopt.* lib/python2.4/new.* " + - "lib/python2.4/os.* lib/python2.4/posixpath.* "+ - "lib/python2.4/warnings.* lib/python2.4/site.* lib/python2.4/stat.* lib/python2.4/UserDict.* " + + "lib/python2.4/getopt.* lib/python2.4/linecache.* lib/python2.4/new.* " + + "lib/python2.4/os.* lib/python2.4/posixpath.* " + + "lib/python2.4/warnings.* lib/python2.4/site.* lib/python2.4/stat.* " + + "lib/python2.4/UserDict.* lib/python2.4/UserList.* lib/python2.4/UserString.* " + "lib/python2.4/lib-dynload/binascii.so lib/python2.4/lib-dynload/struct.so lib/python2.4/lib-dynload/time.so " + "lib/python2.4/lib-dynload/xreadlines.so lib/python2.4/types.* bin/python" ) - m.addPackage( 1, "python-pydoc", "Python Interactive Help Support", "python-core, python-lang, python-stringold, python-re", + m.addPackage( 0, "python-devel", "Python Development Package", "python-core", + "include lib/python2.4/config" ) # package + + m.addPackage( 0, "python-idle", "Python Integrated Development Environment", "python-core, python-tkinter", + "bin/idle lib/python2.4/idlelib" ) # package + + m.addPackage( 0, "python-pydoc", "Python Interactive Help Support", "python-core, python-lang, python-stringold, python-re", "bin/pydoc lib/python2.4/pydoc.*" ) m.setPrefix( "/lib/python2.4/", "${libdir}/python2.4/" ) - m.addPackage( 1, "python-audio", "Python Audio Handling", "python-core", + m.addPackage( 0, "python-audio", "Python Audio Handling", "python-core", "wave.* chunk.* lib-dynload/ossaudiodev.so lib-dynload/audioop.so" ) - m.addPackage( 1, "python-codecs", "Python Codecs, Encodings & i18n Support", "python-core", - "codecs.* encodings locale.* lib-dynload/_locale.so lib-dynload/unicodedata.so gettext.* xdrlib.*" ) + m.addPackage( 0, "python-bsddb", "Python Berkeley Database Bindings", "python-core", + "bsddb" ) # package + + m.addPackage( 0, "python-codecs", "Python Codecs, Encodings & i18n Support", "python-core", + "codecs.* encodings gettext.* locale.* lib-dynload/_locale.so lib-dynload/unicodedata.so stringprep.* xdrlib.*" ) - m.addPackage( 1, "python-compile", "Python Bytecode Compilation Support", "python-core", + m.addPackage( 0, "python-compile", "Python Bytecode Compilation Support", "python-core", "py_compile.* compileall.*" ) - m.addPackage( 1, "python-compiler", "Python Compiler Support", "python-core", + m.addPackage( 0, "python-compiler", "Python Compiler Support", "python-core", "compiler" ) # package - m.addPackage( 1, "python-compression", "Python High Level Compression Support", "python-core, python-zlib", + m.addPackage( 0, "python-compression", "Python High Level Compression Support", "python-core, python-zlib", "gzip.* zipfile.*" ) - m.addPackage( 1, "python-crypt", "Python Basic Cryptographic and Hashing Support", "python-core", + m.addPackage( 0, "python-crypt", "Python Basic Cryptographic and Hashing Support", "python-core", "lib-dynload/crypt.so lib-dynload/md5.so lib-dynload/rotor.so lib-dynload/sha.so" ) - m.addPackage( 1, "python-textutils", "Python Option Parsing, Text Wrapping and Comma-Separated-Value Support", "python-core, python-io, python-re, python-stringold", + m.addPackage( 0, "python-textutils", "Python Option Parsing, Text Wrapping and Comma-Separated-Value Support", "python-core, python-io, python-re, python-stringold", "lib-dynload/_csv.so csv.* optparse.* textwrap.*" ) m.addPackage( 1, "python-curses", "Python Curses Support", "python-core", "curses lib-dynload/_curses.so lib-dynload/_curses_panel.so" ) # package - m.addPackage( 1, "python-db", "Python File-Based Database Support", "python-core", + m.addPackage( 0, "python-datetime", "Python Calendar and Time support", "python-core, python-codecs", + "_strptime.* calendar.* lib-dynload/datetime.so" ) + + m.addPackage( 0, "python-db", "Python File-Based Database Support", "python-core", "anydbm.* dumbdbm.* whichdb.* " ) - m.addPackage( 1, "python-distutils", "Python Distribution Utility", "python-core", - "distutils" ) # package + m.addPackage( 0, "python-distutils", "Python Distribution Utilities", "python-core", + "config distutils" ) # package - m.addPackage( 1, "python-email", "Python Email Support", "python-core, python-io, python-re", + m.addPackage( 0, "python-email", "Python Email Support", "python-core, python-io, python-re", "email" ) # package - m.addPackage( 1, "python-fcntl", "Python's fcntl Interface", "python-core", + m.addPackage( 0, "python-fcntl", "Python's fcntl Interface", "python-core", "lib-dynload/fcntl.so" ) - m.addPackage( 1, "python-hotshot", "Python Hotshot Profiler", "python-core", + m.addPackage( 0, "python-hotshot", "Python Hotshot Profiler", "python-core", "hotshot lib-dynload/_hotshot.so" ) - m.addPackage( 1, "python-html", "Python HTML Processing", "python-core", + m.addPackage( 0, "python-html", "Python HTML Processing", "python-core", "formatter.* htmlentitydefs.* htmllib.* markupbase.* sgmllib.* " ) - m.addPackage( 1, "python-gdbm", "Python GNU Database Support", "python-core, libgdbm3", + m.addPackage( 0, "python-gdbm", "Python GNU Database Support", "python-core, libgdbm3", "lib-dynload/gdbm.so" ) - m.addPackage( 1, "python-image", "Python Graphical Image Handling", "python-core", + m.addPackage( 0, "python-image", "Python Graphical Image Handling", "python-core", "colorsys.* imghdr.* lib-dynload/imageop.so lib-dynload/rgbimg.so" ) - m.addPackage( 1, "python-io", "Python Low-Level I/O", "python-core, python-math", - "lib-dynload/_socket.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so pipes.* socket.* tempfile.* StringIO.* " ) + m.addPackage( 0, "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 " + "pipes.* socket.* tempfile.* StringIO.* " ) - m.addPackage( 2, "python-lang", "Python Low-Level Language Support", "python-core", + m.addPackage( 0, "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 " + "atexit.* code.* codeop.* dis.* inspect.* keyword.* opcode.* repr.* token.* tokenize.* traceback.* linecache.* weakref.*" ) - m.addPackage( 2, "python-math", "Python Math Support", "python-core", + m.addPackage( 0, "python-logging", "Python Logging Support", "python-core", + "logging" ) # package + + m.addPackage( 0, "python-lib-old-and-deprecated", "Python Deprecated Libraries", "python-core", + "lib-old" ) # package + + m.addPackage( 0, "python-tkinter", "Python Tcl/Tk Bindings", "python-core", + "lib-dynload/_tkinter.so lib-tk" ) # package + + m.addPackage( 0, "python-math", "Python Math Support", "python-core", "lib-dynload/cmath.so lib-dynload/math.so lib-dynload/_random.so random.* sets.*" ) - m.addPackage( 1, "python-mime", "Python MIME Handling APIs", "python-core, python-io", - "mimetools.* rfc822.*" ) + m.addPackage( 0, "python-mime", "Python MIME Handling APIs", "python-core, python-io", + "mimetools.* quopri.* rfc822.*" ) - m.addPackage( 1, "python-mmap", "Python Memory-Mapped-File Support", "python-core, python-io", + m.addPackage( 0, "python-mmap", "Python Memory-Mapped-File Support", "python-core, python-io", "lib-dynload/mmap.so " ) - m.addPackage( 1, "python-unixadmin", "Python Unix Administration Support", "python-core", + m.addPackage( 0, "python-unixadmin", "Python Unix Administration Support", "python-core", "lib-dynload/nis.so lib-dynload/grp.so lib-dynload/pwd.so getpass.*" ) - m.addPackage( 1, "python-netclient", "Python Internet Protocol Clients", "python-core, python-io, python-mime", - "base64.* ftplib.* gopherlib.* hmac.* httplib.* mimetypes.* nntplib.* poplib.* smtplib.* telnetlib.* urllib.* urllib2.* urlparse.*" ) + m.addPackage( 1, "python-netclient", "Python Internet Protocol Clients", "python-core, 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.*" ) - m.addPackage( 1, "python-netserver", "Python Internet Protocol Servers", "python-core, python-netclient", + m.addPackage( 0, "python-netserver", "Python Internet Protocol Servers", "python-core, python-netclient", "cgi.* BaseHTTPServer.* SimpleHTTPServer.* SocketServer.*" ) - m.addPackage( 1, "python-pickle", "Python Persistence Support", "python-core, python-re", + m.addPackage( 0, "python-pickle", "Python Persistence Support", "python-core, python-codecs, python-re", "pickle.* shelve.* lib-dynload/cPickle.so" ) - m.addPackage( 1, "python-pprint", "Python Pretty-Print Support", "python-core", + m.addPackage( 0, "python-pprint", "Python Pretty-Print Support", "python-core", "pprint.*" ) - # python-pyqt has its own subdirectory + m.addPackage( 0, "python-profile", "Python Basic Profiling Support", "python-core", + "profile.* pstats.*" ) - # python-pyxml has its own subdirectory - - m.addPackage( 1, "python-re", "Python Regular Expression APIs", "python-core, python-stringold", + m.addPackage( 0, "python-re", "Python Regular Expression APIs", "python-core", "re.* sre.* sre_compile.* sre_constants* sre_parse.*" ) # _sre is builtin - m.addPackage( 1, "python-readline", "Python Readline Support", "python-core, libreadline4", + m.addPackage( 0, "python-readline", "Python Readline Support", "python-core, libreadline4", "lib-dynload/readline.so rlcompleter.*" ) - m.addPackage( 1, "python-resource", "Python Resource Control Interface", "python-core", + m.addPackage( 0, "python-resource", "Python Resource Control Interface", "python-core", "lib-dynload/resource.so" ) - m.addPackage( 1, "python-shell", "Python Shell-Like Functionality", "python-core, python-re", + m.addPackage( 0, "python-shell", "Python Shell-Like Functionality", "python-core, python-re", "commands.* dircache.* fnmatch.* glob.* popen2.* shutil.*" ) - m.addPackage( 1, "python-stringold", "Python Deprecated String APIs", "python-core", + m.addPackage( 0, "python-subprocess", "Python Subprocess Support", "python-core, python-io, python-re", + "subprocess.*" ) + + m.addPackage( 0, "python-stringold", "Python String APIs [deprecated]", "python-core, python-re", "lib-dynload/strop.so string.*" ) - m.addPackage( 1, "python-syslog", "Python's syslog Interface", "python-core", + m.addPackage( 0, "python-syslog", "Python's syslog Interface", "python-core", "lib-dynload/syslog.so" ) - m.addPackage( 1, "python-terminal", "Python Terminal Controlling Support", "python-core, python-io", + m.addPackage( 0, "python-terminal", "Python Terminal Controlling Support", "python-core, python-io", "pty.* tty.*" ) - m.addPackage( 1, "python-threading", "Python Threading & Synchronization Support", "python-core, python-lang", - "bisect.* threading.* Queue.*" ) + m.addPackage( 0, "python-tests", "Python Tests", "python-core", + "test" ) # package - m.addPackage( 1, "python-unittest", "Python Unit Testing Framework", "python-core, python-stringold, python-lang", + m.addPackage( 0, "python-threading", "Python Threading & Synchronization Support", "python-core, python-lang", + "_threading_local.* bisect.* dummy_thread.* dummy_threading.* mutex.* threading.* Queue.*" ) + + m.addPackage( 0, "python-unittest", "Python Unit Testing Framework", "python-core, python-stringold, python-lang", "unittest.*" ) - m.addPackage( 1, "python-xml", "Python basic XML support.", "python-core, python-re", + m.addPackage( 0, "python-xml", "Python basic XML support.", "python-core, python-re", "lib-dynload/pyexpat.so xml xmllib.*" ) # package - m.addPackage( 1, "python-xmlrpc", "Python XMLRPC Support", "python-core, python-xml, python-netserver, python-lang", + m.addPackage( 0, "python-xmlrpc", "Python XMLRPC Support", "python-core, python-xml, python-netserver, python-lang", "xmlrpclib.* SimpleXMLRPCServer.*" ) - m.addPackage( 2, "python-zlib", "Python zlib Support.", "python-core, libz1", + m.addPackage( 1, "python-zlib", "Python zlib Support.", "python-core", "lib-dynload/zlib.so" ) + m.addPackage( 0, "python-mailbox", "Python Mailbox Format Support", "python-core, python-mime", + "mailbox.*" ) + m.make() -- cgit v1.2.3 From 1b5f7764622b8f117f228a5ef0bb487a95a10092 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 25 Aug 2006 13:03:35 +0000 Subject: python-manifest: remove explicit rdependency on libncurses5 --- packages/python/python-2.4.3-manifest.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/python/python-2.4.3-manifest.inc b/packages/python/python-2.4.3-manifest.inc index 82c886658c..1d14654f85 100644 --- a/packages/python/python-2.4.3-manifest.inc +++ b/packages/python/python-2.4.3-manifest.inc @@ -1,5 +1,5 @@ ######################################################################################################################## -### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer ] on Wed Aug 2 23:25:58 2006 +### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2006 Michael 'Mickey' Lauer ] on Fri Aug 25 15:00:35 2006 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -148,8 +148,8 @@ RDEPENDS_python-netserver="python-core python-netclient" FILES_python-netserver="${libdir}/python2.4/cgi.* ${libdir}/python2.4/BaseHTTPServer.* ${libdir}/python2.4/SimpleHTTPServer.* ${libdir}/python2.4/SocketServer.* " DESCRIPTION_python-curses="Python Curses Support" -PR_python-curses="ml0" -RDEPENDS_python-curses="python-core libncurses5" +PR_python-curses="ml1" +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" -- cgit v1.2.3 From b9a8c3254310d3839dee97146c00ab0400543fbb Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 25 Aug 2006 13:18:31 +0000 Subject: networkmanager: depend on libglade --- packages/networkmanager/networkmanager_0.6.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/networkmanager/networkmanager_0.6.4.bb b/packages/networkmanager/networkmanager_0.6.4.bb index d30a101bcb..e9c02ba3dd 100644 --- a/packages/networkmanager/networkmanager_0.6.4.bb +++ b/packages/networkmanager/networkmanager_0.6.4.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" HOMEPAGE = "http://www.gnome.org" MAINTAINER = "Milan Plzik " PRIORITY = "optional" -DEPENDS = "libnl dbus dbus-glib libhal-nm libgpewidget gnome-keyring gconf-dbus wireless-tools" +DEPENDS = "libnl dbus dbus-glib libhal-nm libgpewidget gnome-keyring gconf-dbus wireless-tools libglade" RDEPENDS = "wpa-supplicant dhcdbd gnome-keyring hicolor-icon-theme" PR = "r1" -- cgit v1.2.3 From b152323dc21356129868e19d6a65804c10b7757d Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 25 Aug 2006 15:19:22 +0000 Subject: h4000: Use modutils 2.6. --- conf/machine/h4000.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index 410de9a100..41301c1721 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -11,6 +11,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" ROOT_FLASH_SIZE = "32" +MODUTILS = "26" PCMCIA_MANAGER = "pcmciautils" BOOT_MODULES = " ${@linux_module_packages('${H4000_MODULES}', d)}" -- cgit v1.2.3 From 4b0d1a5487be990fcb99badadb8068283b9e1a06 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 25 Aug 2006 15:29:19 +0000 Subject: feed-browser: much better sectionlist (rewrite to be recursive anyone?) --- contrib/feed-browser/includes/functions.inc | 94 ++++++++++++++++------------- 1 file changed, 53 insertions(+), 41 deletions(-) diff --git a/contrib/feed-browser/includes/functions.inc b/contrib/feed-browser/includes/functions.inc index 4b0b898118..4745c75910 100644 --- a/contrib/feed-browser/includes/functions.inc +++ b/contrib/feed-browser/includes/functions.inc @@ -332,68 +332,80 @@ function sectionslist() if($result = db_query ("SELECT DISTINCT p_section FROM packages ORDER BY p_section")) { - $ipkgoutput = "
    \n"; + $section_up = ''; - $section_up = $result[0]['p_section']; - $section_level = FALSE; - $opie_top = FALSE; + $sections = array(); - foreach($result as $item) + foreach($result as $package) { - $section_name = $item['p_section']; + $section_split = explode('/', $package['p_section']); - if(0 === strpos($section_name, 'opie') AND !$opie_top) + if($section_up != $section_split[0]) { - $opie_top = TRUE; - - $section_up = 'opie'; + $section_up = $section_split[0]; } - elseif($opie_top AND 0 !== strpos($section_name, 'opie')) + + if(isset($section_split[1])) // x11/gnome/libs { - $opie_top = FALSE; + $sections[$section_up][$section_split[1]] = $section_split[1]; + + if(isset($section_split[2])) // x11/gnome/libs + { + $sections[ $section_up ][ $section_split[1] ] = array($section_split[2]=>$section_split[2]); + } } + } + + $output = "
      \n"; - if( - strpos($section_name, '/') // subsection - ) + foreach($sections as $section_name1=>$item) + { + $output .= sprintf ("
    • %s", + urlencode($section_name1), + urlencode($section_name1), + $section_name1); + + if(is_array($item)) { - if(0 === strpos($section_name, $section_up . '/')) // console/network are not part of console/net + $output .= '
        '; + + foreach($item as $section_name2=>$subitem) { - if(!$section_level) + $section_name = "{$section_name1}/{$section_name2}"; + $output .= sprintf ("
      • %s", + urlencode($section_name), + urlencode($section_name), + $section_name2); + + if(is_array($subitem)) { - $ipkgoutput .= '
        • '; + $output .= '
            '; + + foreach($subitem as $section_name3=>$subitem2) + { + $section_name = "{$section_name1}/{$section_name2}/{$section_name3}"; + $output .= sprintf ("
          • %s
            • ", + urlencode($section_name), + urlencode($section_name), + $section_name3); + } + + $output .= '
          '; } - $section_name = str_replace($section_up . '/', '', $item['p_section']); - $section_level = TRUE; + $output .= ''; } - } - elseif($section_level) - { - $section_up = $section_name; - $ipkgoutput .= '
        • '; - $section_level = FALSE; - } - else - { - $section_up = $section_name; + + $output .= '
      '; } - $ipkgoutput .= sprintf ("
    • %s
      • ", - urlencode($item['p_section']), - urlencode($item['p_section']), - $section_name); + $output .= ''; } - if($section_level) - { - $ipkgoutput .= '
    '; - } - - $ipkgoutput .= "
\n"; + $output .= "\n"; } - return $ipkgoutput; + return $output; } function check_database() -- cgit v1.2.3 From 31489e5e5023c60be052aa263c53d33ddfcb6742 Mon Sep 17 00:00:00 2001 From: Mustafa Yuecel Date: Fri, 25 Aug 2006 16:13:33 +0000 Subject: initscripts-1.0/slugos/devices.patch: adapt patch to the current devices file --- packages/initscripts/initscripts-1.0/slugos/devices.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/initscripts/initscripts-1.0/slugos/devices.patch b/packages/initscripts/initscripts-1.0/slugos/devices.patch index 26b1841d5b..2583b62f48 100644 --- a/packages/initscripts/initscripts-1.0/slugos/devices.patch +++ b/packages/initscripts/initscripts-1.0/slugos/devices.patch @@ -8,8 +8,8 @@ . /etc/default/rcS # exit without doing anything if udev is active --if test -e /dev/.udevdb; then -+if test -e /dev/.udevdb -o -e /dev/.permanent; then +-if test -e /dev/.udev -o -e /dev/.udevdb; then ++if test -e /dev/.udev -o -e /dev/.udevdb -o -e /dev/.permanent; then exit 0 fi -- cgit v1.2.3 From b3556207e1db3ecae008038a3d837959de12bc22 Mon Sep 17 00:00:00 2001 From: Mustafa Yuecel Date: Fri, 25 Aug 2006 16:32:16 +0000 Subject: avetanabt: add version 20060413 - cvs version: updated path to CVS repository, DEFAULT_PREFERENCE = "-1" --- packages/avetanabt/avetanabt_20060413.bb | 63 ++++++++++++++++++++++++++++++++ packages/avetanabt/avetanabt_cvs.bb | 8 ++-- 2 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 packages/avetanabt/avetanabt_20060413.bb diff --git a/packages/avetanabt/avetanabt_20060413.bb b/packages/avetanabt/avetanabt_20060413.bb new file mode 100644 index 0000000000..8472e0e0ce --- /dev/null +++ b/packages/avetanabt/avetanabt_20060413.bb @@ -0,0 +1,63 @@ +DESCRIPTION = "avetanaBT: Bluetooth API implementation for Java (JSR-82)" +SECTION = "devel" +DEPENDS = "findutils-native jikes-native kaffeh-native fastjar-native bluez-libs classpath" +MAINTAINER = "Mustafa Yuecel " +LICENSE = "GPL" +HOMEPAGE = "http://sourceforge.net/projects/avetanabt/" + +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/avetanabt/avetanaBluetooth-${PV}.tgz" + +S = "${WORKDIR}/avetanabt" + +PACKAGES = "${PN}" +FILES_${PN} = "${libdir}/libavetanaBT.so ${datadir}/avetanabt/avetanaBT.jar" + +do_compile() { + + # doing nearly the same as in Makefile written... + + # clean build directory + mkdir -p build + rm -fr build/* + + # generate classes + # javac -> jikes + ${STAGING_BINDIR}/find {de,javax,com} -iname *.java > file.list + ${STAGING_BINDIR}/jikes -verbose --bootclasspath ${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d build @file.list + + # create own version.xml (add version information available at runtime) + head -n 4 version.xml >> build/version.xml + echo " " >> build/version.xml + tail -n 3 version.xml >> build/version.xml + + # move classes into jar archive + # jar -> fastjar + ${STAGING_BINDIR}/fastjar -v -cf avetanaBT.jar -C build de -C build javax -C build com -C build version.xml + + # JNI generated header file - de_avetana_bluetooth_stack_BlueZ.h + # javah -> kaffeh + ${STAGING_BINDIR}/kaffeh -jni -classpath avetanaBT.jar:${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d c de.avetana.bluetooth.stack.BlueZ + + # Native language (C) library - libavetanaBT.so + ${CXX} ${CXXFLAGS} -shared -lbluetooth -I${STAGING_INCDIR}/classpath c/BlueZ.cpp -o libavetanaBT.so ${LDFLAGS} + +} + +do_stage() { + + install -d ${STAGING_DIR}/${BUILD_SYS}/share/avetanabt + install avetanaBT.jar ${STAGING_DIR}/${BUILD_SYS}/share/avetanabt/ + +} + +do_install() { + + install -d ${D}${libdir} + install -m 0755 libavetanaBT.so ${D}${libdir}/ + + install -d ${D}${datadir}/avetanabt + install avetanaBT.jar ${D}${datadir}/avetanabt/ + +} diff --git a/packages/avetanabt/avetanabt_cvs.bb b/packages/avetanabt/avetanabt_cvs.bb index 7f6bea2a20..c25699caf0 100644 --- a/packages/avetanabt/avetanabt_cvs.bb +++ b/packages/avetanabt/avetanabt_cvs.bb @@ -5,10 +5,12 @@ MAINTAINER = "Mustafa Yuecel " LICENSE = "GPL" HOMEPAGE = "http://sourceforge.net/projects/avetanabt/" -PV = "0.0+cvs${SRCDATE}" -PR = "r3" +DEFAULT_PREFERENCE = "-1" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/avetanabt;module=avetanabt" +PV = "20060413+cvs${SRCDATE}" +PR = "r5" + +SRC_URI = "cvs://anonymous@avetanabt.cvs.sourceforge.net/cvsroot/avetanabt;module=avetanabt" S = "${WORKDIR}/avetanabt" -- cgit v1.2.3 From 0d607195ebad2d7b4ccd2fc985e9daaf2dd70b80 Mon Sep 17 00:00:00 2001 From: Mustafa Yuecel Date: Fri, 25 Aug 2006 17:25:34 +0000 Subject: subversion: add (disabled) version 1.3.2 - DEFAULT_PREFERENCE = "-1" due to errors on stage phase - bug report follows soon --- packages/subversion/subversion_1.3.2.bb | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 packages/subversion/subversion_1.3.2.bb diff --git a/packages/subversion/subversion_1.3.2.bb b/packages/subversion/subversion_1.3.2.bb new file mode 100644 index 0000000000..f508381d15 --- /dev/null +++ b/packages/subversion/subversion_1.3.2.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "The Subversion (svn) client" +SECTION = "console/network" +DEPENDS = "apr-util-0.9.12 neon" +MAINTAINER = "Mustafa Yuecel " +LICENSE = "Apache/BSD" +HOMEPAGE = "http://subversion.tigris.org" +PR = "r0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ + file://disable-revision-install.patch;patch=1" + +EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${BUILD_SYS} \ + --without-berkeley-db --without-apxs --without-apache \ + --without-swig --with-apr=${STAGING_BINDIR} \ + --with-apr-util=${STAGING_BINDIR}" + +inherit autotools + +do_configure() { + oe_runconf +} -- cgit v1.2.3 From 0b914dfc958842c1959290d9d14eaf498582b18d Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Fri, 25 Aug 2006 17:56:44 +0000 Subject: omap5912conf : Fix preferred version variables * use linux-omap1_2.6.12-rc2 for now * prepare to use linux-omap1_2.6.17-omap1 when it works --- conf/machine/omap5912osk.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index 49ea6f6b90..a2c01add5d 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -10,6 +10,8 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" PREFERRED_VERSION_u-boot = "LABEL.2006.06.30.2020" +#PREFERRED_VERSION_linux-omap1 = "2.6.17-omap1" +PREFERRED_VERSION_linux-omap1 = "2.6.12-rc2" BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" -- cgit v1.2.3 From d03fe953c4afa07e1200a3705ab86e6f3d3586e8 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Fri, 25 Aug 2006 17:58:17 +0000 Subject: distro/openomap.conf : Update toolchain versions --- conf/distro/openomap.conf | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/conf/distro/openomap.conf b/conf/distro/openomap.conf index 192400b9a1..fb06ca7f47 100644 --- a/conf/distro/openomap.conf +++ b/conf/distro/openomap.conf @@ -9,3 +9,26 @@ TARGET_FPU ?= "soft" # 2.4 vs 2.6 is a distro decision. MODUTILS = "26" BOOTSTRAP_EXTRA_RDEPENDS += "udev" + +PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" + +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" + +#EABI stuff +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" + + +#use EABI toolchain +PREFERRED_VERSION_gcc ?= "4.1.1" +PREFERRED_VERSION_gcc-cross ?= "4.1.1" +PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" +PREFERRED_VERSION_binutils ?= "2.17" +PREFERRED_VERSION_binutils-cross ?= "2.17" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" +PREFERRED_VERSION_glibc ?= "2.4" +PREFERRED_VERSION_glibc-intermediate ?= "2.4" + -- cgit v1.2.3 From 4f1963886d9d2227be98a4473ceefc9c1011d1fd Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Fri, 25 Aug 2006 18:03:06 +0000 Subject: linux-omap1_2.6.12-rc2.bb : Fixes so it builds reliably * add dependency on u-boot * Fix do_deploy to massage kernel for use on omap5912osk board --- packages/linux/linux-omap1_2.6.12-rc2.bb | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/packages/linux/linux-omap1_2.6.12-rc2.bb b/packages/linux/linux-omap1_2.6.12-rc2.bb index 7ea9e16091..46e7d0ba95 100644 --- a/packages/linux/linux-omap1_2.6.12-rc2.bb +++ b/packages/linux/linux-omap1_2.6.12-rc2.bb @@ -14,7 +14,7 @@ KERNEL_IMAGETYPE = "vmlinux" KERNEL_OUTPUT = "arch/${ARCH}/boot/compressed/${KERNEL_IMAGETYPE}" KERNEL_CCSUFFIX = "-3.3.4" -#DEPENDS = "uboot" +DEPENDS = "u-boot" inherit kernel @@ -25,13 +25,17 @@ do_configure_prepend() { oe_runmake oldconfig } -do_deploy_omap5912osk() { - install -d ${DEPLOY_DIR_IMAGE} - arm-linux-objcopy -O binary -R .note -R .comment -S arch/arm/boot/compressed/vmlinux ${DEPLOY_DIR}/linux.bin - gzip -f -9 ${DEPLOY_DIR}/linux.bin - mkimage -A arm -O linux -T kernel -C gzip -a 0x10c08000 -e 0x10c08000 -n "OE" -d ${DEPLOY_DIR}/linux.bin.gz ${DEPLOY_DIR}/uImage_bb.cc - cp ${DEPLOY_DIR}/uImage_bb.cc /tftpboot -# install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin +do_deploy() { + if [ "${MACHINE}" == "omap5912osk" ]; then + install -d ${DEPLOY_DIR_IMAGE} + arm-linux-objcopy -O binary -R .note -R .comment -S arch/arm/boot/compressed/vmlinux ${DEPLOY_DIR_IMAGE}/linux.bin + gzip -f -9 ${DEPLOY_DIR_IMAGE}/linux.bin + mkimage -A arm -O linux -T kernel -C gzip -a 0x10c08000 -e 0x10c08000 -n "OE" -d ${DEPLOY_DIR_IMAGE}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin + rm ${DEPLOY_DIR_IMAGE}/linux.bin.gz + +# cp ${DEPLOY_DIR}/uImage_bb.cc /tftpboot +# install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin + fi } -- cgit v1.2.3 From 6bdb98734e08cf7f1adb65a39ddfc108b1e85b45 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 25 Aug 2006 18:14:28 +0000 Subject: classes: run do_package before do_stage so we can populate staging with package if we want --- classes/base.bbclass | 6 ++---- classes/package.bbclass | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index 6f8468b119..f936dff870 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -601,8 +601,6 @@ base_do_compile() { fi } - -addtask stage after do_compile base_do_stage () { : } @@ -614,13 +612,13 @@ do_populate_staging[dirs] = "${STAGING_DIR}/${TARGET_SYS}/bin ${STAGING_DIR}/${T ${STAGING_DATADIR} \ ${S} ${B}" -addtask populate_staging after do_compile +addtask populate_staging after do_package python do_populate_staging () { bb.build.exec_func('do_stage', d) } -addtask install after do_compile +addtask install after do_compile do_install[dirs] = "${S} ${B}" base_do_install() { diff --git a/classes/package.bbclass b/classes/package.bbclass index 0d6a7734af..d6f50fb49d 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -738,4 +738,4 @@ do_package[dirs] = "${D}" do_package[deptask] = "do_package" populate_packages[dirs] = "${D}" EXPORT_FUNCTIONS do_package do_shlibs do_split_locales mapping_rename_hook -addtask package before do_build after do_populate_staging +addtask package before do_build after do_install -- cgit v1.2.3