Green 3.3.1 Release

Signed-off-by: Joshua Lock <josh@linux.intel.com>
package_*.bbclass: Only set pkg in overrides. These are the only values we're interested in expanding and this makes sure we obtain the expected data
2026-02-03 15:28:42 +01:00 · 2010-07-08 12:14:07 +01:00 · 2010-07-07 12:56:25 +01:00 · 2010-07-07 12:24:49 +01:00 · 2010-07-03 13:35:22 +01:00 · 2010-06-30 15:08:42 +01:00
3875 changed files with 3164418 additions and 246160 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,35 @@
+*.pyc
+*.pyo
+build/conf/local.conf
+build/conf/bblayers.conf
+build/tmp/
+pstage/
+scripts/poky-git-proxy-socks
+sources/
+meta-darwin
+meta-maemo
+meta-prvt*
+poky-autobuilder*
+*.swp
+*.orig
+*.rej
+*~
+handbook/poky-doc-tools/Makefile
+handbook/poky-doc-tools/Makefile.in
+handbook/poky-doc-tools/aclocal.m4
+handbook/poky-doc-tools/autom4te.cache/
+handbook/poky-doc-tools/common/Makefile
+handbook/poky-doc-tools/common/Makefile.in
+handbook/poky-doc-tools/common/fop-config.xml
+handbook/poky-doc-tools/config.log
+handbook/poky-doc-tools/config.status
+handbook/poky-doc-tools/configure
+handbook/poky-doc-tools/install-sh
+handbook/poky-doc-tools/missing
+handbook/poky-doc-tools/poky-docbook-to-pdf
+handbook/poky-handbook.html
+handbook/poky-handbook.pdf
+handbook/poky-handbook.tgz
+handbook/bsp-guide.html
+handbook/bsp-guide.pdf
+
--- a/5
+++ b/5
@@ -5,7 +5,10 @@ bitbake/COPYING (GPLv2)
 meta/COPYING.MIT (MIT)
 meta-extras/COPYING.MIT (MIT)

-which cover the components in those subdirectories.
+which cover the components in those subdirectories. This means all 
+metadata is MIT licensed unless otherwise stated. Source code included 
+in tree for individual recipes is under the LICENSE stated in the .bb 
+file for those software projects unless otherwise stated.

 License information for any other files is either explicitly stated 
 or defaults to GPL version 2.
--- a/bitbake/AUTHORS
+++ b/bitbake/AUTHORS
@@ -2,7 +2,7 @@ Tim Ansell <mithro@mithis.net>
 Phil Blundell <pb@handhelds.org>
 Seb Frankengul <seb@frankengul.org>
 Holger Freyther <zecke@handhelds.org>
-Marcin Juszkiewicz <hrw@hrw.one.pl>
+Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
 Chris Larson <kergoth@handhelds.org>
 Ulrich Luckas <luckas@musoft.de>
 Mickey Lauer <mickey@Vanille.de>
--- a/bitbake/ChangeLog
+++ b/bitbake/ChangeLog
@@ -1,12 +1,61 @@
-Changes in BitBake 1.8.x:
-	- Fix exit code for build failures in --continue mode
-	- Fix git branch tags fetching
-
-Changes in BitBake 1.8.10:
-	- Psyco is available only for x86 - do not use it on other architectures.
+Changes in Bitbake 1.9.x:
+	- Add PE (Package Epoch) support from Philipp Zabel (pH5)
+	- Treat python functions the same as shell functions for logging
+	- Use TMPDIR/anonfunc as a __anonfunc temp directory (T)
+	- Catch truncated cache file errors
+	- Allow operations other than assignment on flag variables
+	- Add code to handle inter-task dependencies
+	- Fix cache errors when generation dotGraphs
+	- Make sure __inherit_cache is updated before calling include() (from Michael Krelin)
+	- Fix bug when target was in ASSUME_PROVIDED (#2236)
+	- Raise ParseError for filenames with multiple underscores instead of infinitely looping (#2062)
+	- Fix invalid regexp in BBMASK error handling (missing import) (#1124)
+	- Promote certain warnings from debug to note 2 level
+	- Update manual
+	- Correctly redirect stdin when forking
+	- If parsing errors are found, exit, too many users miss the errors
+	- Remove supriours PREFERRED_PROVIDER warnings
+	- svn fetcher: Add _buildsvncommand function
+	- Improve certain error messages
+	- Rewrite svn fetcher to make adding extra operations easier 
+	  as part of future SRCDATE="now" fixes
+	  (requires new FETCHCMD_svn definition in bitbake.conf)
+	- Change SVNDIR layout to be more unique (fixes #2644 and #2624)
+	- Add ConfigParsed Event after configuration parsing is complete
+	- Add SRCREV support for svn fetcher
+	- data.emit_var() - only call getVar if we need the variable
+	- Stop generating the A variable (seems to be legacy code)
+	- Make sure intertask depends get processed correcting in recursive depends
+	- Add pn-PN to overrides when evaluating PREFERRED_VERSION
+	- Improve the progress indicator by skipping tasks that have 
+	  already run before starting the build rather than during it
+	- Add profiling option (-P)
+	- Add BB_SRCREV_POLICY variable (clear or cache) to control SRCREV cache
+	- Add SRCREV_FORMAT support
+	- Fix local fetcher's localpath return values
+	- Apply OVERRIDES before performing immediate expansions
+	- Allow the -b -e option combination to take regular expressions
+	- Fix handling of variables with expansion in the name using _append/_prepend
+	  e.g. RRECOMMENDS_${PN}_append_xyz = "abc"
+	- Add plain message function to bb.msg
+	- Sort the list of providers before processing so dependency problems are 
+	  reproducible rather than effectively random
+	- Fix/improve bitbake -s output
+	- Add locking for fetchers so only one tries to fetch a given file at a given time
+	- Fix int(0)/None confusion in runqueue.py which causes random gaps in dependency chains	  
+	- Expand data in addtasks
+	- Print the list of missing DEPENDS,RDEPENDS for the "No buildable providers available for required...."
+	  error message.
+	- Rework add_task to be more efficient (6% speedup, 7% number of function calls reduction)
+	- Sort digraph output to make builds more reproducible
+	- Split expandKeys into two for loops to benefit from the expand_cache (12% speedup)
+	- runqueue.py: Fix idepends handling to avoid dependency errors
+	- Clear the terminal TOSTOP flag if set (and warn the user)
+	- Fix regression from r653 and make SRCDATE/CVSDATE work for packages again
 	- Fix a bug in bb.decodeurl where http://some.where.com/somefile.tgz decoded to host="" (#1530)
 	- Warn about malformed PREFERRED_PROVIDERS (#1072)
 	- Add support for BB_NICE_LEVEL option (#1627)
+	- Psyco is used only on x86 as there is no support for other architectures.
 	- Sort initial providers list by default preference (#1145, #2024)
 	- Improve provider sorting so prefered versions have preference over latest versions (#768)
 	- Detect builds of tasks with overlapping providers and warn (will become a fatal error) (#1359)
@@ -18,7 +67,8 @@ Changes in BitBake 1.8.10:
 	  do_taskname[cleandirs] = "dir"
 	- bzr fetcher tweaks from Robert Schuster (#2913)
 	- Add mercurial (hg) fetcher from Robert Schuster (#2913)
-	- Fix bogus preferred_version return values
+	- Don't add duplicates to BBPATH
+	- Fix preferred_version return values (providers.py)
 	- Fix 'depends' flag splitting
 	- Fix unexport handling (#3135)
 	- Add bb.copyfile function similar to bb.movefile (and improve movefile error reporting)
@@ -41,68 +91,93 @@ Changes in BitBake 1.8.10:
 	- Fix shell data updating problems (#1880)
 	- Properly raise errors for invalid source URI protocols
 	- Change the wget fetcher failure handling to avoid lockfile problems
-	- Add git branch support
 	- Add support for branches in git fetcher (Otavio Salvador, Michael Lauer)
 	- Make taskdata and runqueue errors more user friendly
 	- Add norecurse and fullpath options to cvs fetcher
-
-Changes in Bitbake 1.8.8:
-	- Rewrite svn fetcher to make adding extra operations easier 
-	  as part of future SRCDATE="now" fixes
-	  (requires new FETCHCMD_svn definition in bitbake.conf)
-	- Change SVNDIR layout to be more unique (fixes #2644 and #2624)
-	- Import persistent data store from trunk
-	- Sync fetcher code with that in trunk, adding SRCREV support for svn
-	- Add ConfigParsed Event after configuration parsing is complete
-	- data.emit_var() - only call getVar if we need the variable
-	- Stop generating the A variable (seems to be legacy code)
-	- Make sure intertask depends get processed correcting in recursive depends
-	- Add pn-PN to overrides when evaluating PREFERRED_VERSION
-	- Improve the progress indicator by skipping tasks that have 
-	  already run before starting the build rather than during it
-	- Add profiling option (-P)
-	- Add BB_SRCREV_POLICY variable (clear or cache) to control SRCREV cache
-	- Add SRCREV_FORMAT support
-	- Fix local fetcher's localpath return values
-	- Apply OVERRIDES before performing immediate expansions
-	- Allow the -b -e option combination to take regular expressions
-	- Add plain message function to bb.msg
-	- Sort the list of providers before processing so dependency problems are 
-	  reproducible rather than effectively random
-	- Add locking for fetchers so only one tries to fetch a given file at a given time
-	- Fix int(0)/None confusion in runqueue.py which causes random gaps in dependency chains
-	- Fix handling of variables with expansion in the name using _append/_prepend
-	  e.g. RRECOMMENDS_${PN}_append_xyz = "abc"
-	- Expand data in addtasks
- 	- Print the list of missing DEPENDS,RDEPENDS for the "No buildable providers available for required...."
- 	  error message.
-	- Rework add_task to be more efficient (6% speedup, 7% number of function calls reduction)
-	- Sort digraph output to make builds more reproducible
-	- Split expandKeys into two for loops to benefit from the expand_cache (12% speedup)
-	- runqueue.py: Fix idepends handling to avoid dependency errors
-	- Clear the terminal TOSTOP flag if set (and warn the user)
-	- Fix regression from r653 and make SRCDATE/CVSDATE work for packages again
-
-Changes in Bitbake 1.8.6:
-	- Correctly redirect stdin when forking
-	- If parsing errors are found, exit, too many users miss the errors
-	- Remove supriours PREFERRED_PROVIDER warnings
-
-Changes in Bitbake 1.8.4:
-	- Make sure __inherit_cache is updated before calling include() (from Michael Krelin)
-	- Fix bug when target was in ASSUME_PROVIDED (#2236)
-	- Raise ParseError for filenames with multiple underscores instead of infinitely looping (#2062)
-	- Fix invalid regexp in BBMASK error handling (missing import) (#1124)
-	- Don't run build sanity checks on incomplete builds
-	- Promote certain warnings from debug to note 2 level
-	- Update manual
-
-Changes in Bitbake 1.8.2:
-	- Catch truncated cache file errors
-	- Add PE (Package Epoch) support from Philipp Zabel (pH5)
-	- Add code to handle inter-task dependencies
-	- Allow operations other than assignment on flag variables
-	- Fix cache errors when generation dotGraphs
+	- Fix exit code for build failures in --continue mode
+	- Fix git branch tags fetching
+	- Change parseConfigurationFile so it works on real data, not a copy
+	- Handle 'base' inherit and all other INHERITs from parseConfigurationFile 
+	  instead of BBHandler
+	- Fix getVarFlags bug in data_smart
+	- Optmise cache handling by more quickly detecting an invalid cache, only 
+	  saving the cache when its changed, moving the cache validity check into
+	  the parsing loop and factoring some getVar calls outside a for loop
+	- Cooker: Remove a debug message from the parsing loop to lower overhead
+	- Convert build.py exec_task to use getVarFlags
+	- Update shell to use cooker.buildFile
+	- Add StampUpdate event
+	- Convert -b option to use taskdata/runqueue
+	- Remove digraph and switch to new stamp checking code. exec_task no longer
+	  honours dependencies
+	- Make fetcher timestamp updating non-fatal when permissions don't allow 
+	  updates
+	- Add BB_SCHEDULER variable/option ("completion" or "speed") controlling
+	  the way bitbake schedules tasks
+	- Add BB_STAMP_POLICY variable/option ("perfile" or "full") controlling
+	  how extensively stamps are looked at for validity
+	- When handling build target failures make sure idepends are checked and
+	  failed where needed. Fixes --continue mode crashes.
+	- Fix -f (force) in conjunction with -b
+	- Fix problems with recrdeptask handling where some idepends weren't handled
+	  correctly.
+	- Handle exit codes correctly (from pH5)
+	- Work around refs/HEAD issues with git over http (#3410)
+	- Add proxy support to the CVS fetcher (from Cyril Chemparathy)
+	- Improve runfetchcmd so errors are seen and various GIT variables are exported
+	- Add ability to fetchers to check URL validity without downloading
+	- Improve runtime PREFERRED_PROVIDERS warning message
+	- Add BB_STAMP_WHITELIST option which contains a list of stamps to ignore when
+	  checking stamp dependencies and using a BB_STAMP_POLICY of "whitelist"
+	- No longer weight providers on the basis of a package being "already staged". This
+	  leads to builds being non-deterministic.
+	- Flush stdout/stderr before forking to fix duplicate console output
+	- Make sure recrdeps tasks include all inter-task dependencies of a given fn
+	- Add bb.runqueue.check_stamp_fn() for use by packaged-staging
+	- Add PERSISTENT_DIR to store the PersistData in a persistent
+	  directory != the cache dir.
+	- Add md5 and sha256 checksum generation functions to utils.py
+	- Correctly handle '-' characters in class names (#2958)
+	- Make sure expandKeys has been called on the data dictonary before running tasks
+	- Correctly add a task override in the form task-TASKNAME.
+	- Revert the '-' character fix in class names since it breaks things
+	- When a regexp fails to compile for PACKAGES_DYNAMIC, print a more useful error (#4444)
+	- Allow to checkout CVS by Date and Time. Just add HHmm to the SRCDATE.
+	- Move prunedir function to utils.py and add explode_dep_versions function
+	- Raise an exception if SRCREV == 'INVALID'
+	- Fix hg fetcher username/password handling and fix crash
+	- Fix PACKAGES_DYNAMIC handling of packages with '++' in the name
+	- Rename __depends to __base_depends after configuration parsing so we don't
+	  recheck the validity of the config files time after time
+	- Add better environmental variable handling. By default it will now only pass certain 
+	  whitelisted variables into the data store. If BB_PRESERVE_ENV is set bitbake will use
+	  all variable from the environment. If BB_ENV_WHITELIST is set, that whitelist will be
+	  used instead of the internal bitbake one. Alternatively, BB_ENV_EXTRAWHITE can be used
+	  to extend the internal whitelist.
+	- Perforce fetcher fix to use commandline options instead of being overriden by the environment
+	- bb.utils.prunedir can cope with symlinks to directoriees without exceptions
+	- use @rev when doing a svn checkout
+	- Add osc fetcher (from Joshua Lock in Poky)
+	- When SRCREV autorevisioning for a recipe is in use, don't cache the recipe
+	- Add tryaltconfigs option to control whether bitbake trys using alternative providers
+	  to fulfil failed dependencies. It defaults to off, changing the default since this
+	  behaviour confuses many users and isn't often useful.
+	- Improve lock file function error handling
+	- Add username handling to the git fetcher (Robert Bragg)
+	- Add support for HTTP_PROXY and HTTP_PROXY_IGNORE variables to the wget fetcher
+	- Export more variables to the fetcher commands to allow ssh checkouts and checkouts through 
+	  proxies to work better. (from Poky)
+	- Also allow user and pswd options in SRC_URIs globally (from Poky)
+	- Improve proxy handling when using mirrors (from Poky)
+	- Add bb.utils.prune_suffix function
+	- Fix hg checkouts of specific revisions (from Poky)
+	- Fix wget fetching of urls with parameters specified (from Poky)
+	- Add username handling to git fetcher (from Poky)
+	- Set HOME environmental variable when running fetcher commands (from Poky)
+	- Make sure allowed variables inherited from the environment are exported again (from Poky)
+	- When running a stage task in bbshell, run populate_staging, not the stage task (from Poky)
+	- Fix + character escaping from PACKAGES_DYNAMIC (thanks Otavio Salvador)
+	- Addition of BBCLASSEXTEND support for allowing one recipe to provide multiple targets (from Poky)

 Changes in Bitbake 1.8.0:
 	- Release 1.7.x as a stable series
--- a/bitbake/MANIFEST
+++ b/bitbake/MANIFEST
@@ -1,52 +0,0 @@
-AUTHORS
-COPYING
-ChangeLog
-MANIFEST
-setup.py
-bin/bitdoc
-bin/bbimage
-bin/bitbake
-lib/bb/__init__.py
-lib/bb/build.py
-lib/bb/cache.py
-lib/bb/cooker.py
-lib/bb/COW.py
-lib/bb/data.py
-lib/bb/data_smart.py
-lib/bb/event.py
-lib/bb/fetch/__init__.py
-lib/bb/fetch/bzr.py
-lib/bb/fetch/cvs.py
-lib/bb/fetch/git.py
-lib/bb/fetch/hg.py
-lib/bb/fetch/local.py
-lib/bb/fetch/perforce.py
-lib/bb/fetch/ssh.py
-lib/bb/fetch/svk.py
-lib/bb/fetch/svn.py
-lib/bb/fetch/wget.py
-lib/bb/manifest.py
-lib/bb/methodpool.py
-lib/bb/msg.py
-lib/bb/parse/__init__.py
-lib/bb/parse/parse_py/__init__.py
-lib/bb/parse/parse_py/BBHandler.py
-lib/bb/parse/parse_py/ConfHandler.py
-lib/bb/persist_data.py
-lib/bb/providers.py
-lib/bb/runqueue.py
-lib/bb/shell.py
-lib/bb/taskdata.py
-lib/bb/utils.py
-setup.py
-doc/COPYING.GPL
-doc/COPYING.MIT
-doc/bitbake.1
-doc/manual/html.css
-doc/manual/Makefile
-doc/manual/usermanual.xml
-contrib/bbdev.sh
-contrib/vim/syntax/bitbake.vim
-contrib/vim/ftdetect/bitbake.vim
-conf/bitbake.conf
-classes/base.bbclass
--- a/bitbake/bin/bbimage
+++ b/bitbake/bin/bbimage
@@ -1,155 +0,0 @@
-#!/usr/bin/env python
-# ex:ts=4:sw=4:sts=4:et
-# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
-#
-# Copyright (C) 2003  Chris Larson
-#
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 2 as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License along
-#    with this program; if not, write to the Free Software Foundation, Inc.,
-#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-import sys, os
-sys.path.insert(0,os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])), 'lib'))
-import bb
-from bb import *
-
-__version__ = 1.1
-type = "jffs2"
-cfg_bb = data.init()
-cfg_oespawn = data.init()
-
-bb.msg.set_debug_level(0)
-
-def usage():
-    print "Usage: bbimage [options ...]"
-    print "Creates an image for a target device from a root filesystem,"
-    print "obeying configuration parameters from the BitBake"
-    print "configuration files, thereby easing handling of deviceisms."
-    print ""
-    print "  %s\t\t%s" % ("-r [arg], --root [arg]", "root directory (default=${IMAGE_ROOTFS})")
-    print "  %s\t\t%s" % ("-t [arg], --type [arg]", "image type (jffs2[default], cramfs)")
-    print "  %s\t\t%s" % ("-n [arg], --name [arg]", "image name (override IMAGE_NAME variable)")
-    print "  %s\t\t%s" % ("-v, --version", "output version information and exit")
-    sys.exit(0)
-
-def version():
-    print "BitBake Build Tool Core version %s" % bb.__version__
-    print "BBImage version %s" % __version__
-
-def emit_bb(d, base_d = {}):
-    for v in d.keys():
-        if d[v] != base_d[v]:
-            data.emit_var(v, d)
-
-def getopthash(l):
-    h = {}
-    for (opt, val) in l:
-        h[opt] = val
-    return h
-
-import getopt
-try:
-    (opts, args) = getopt.getopt(sys.argv[1:], 'vr:t:e:n:', [ 'version', 'root=', 'type=', 'bbfile=', 'name=' ])
-except getopt.GetoptError:
-    usage()
-
-# handle opts
-opthash = getopthash(opts)
-
-if '--version' in opthash or '-v' in opthash:
-    version()
-    sys.exit(0)
-
-try:
-    cfg_bb = parse.handle(os.path.join('conf', 'bitbake.conf'), cfg_bb)
-except IOError:
-    fatal("Unable to open bitbake.conf")
-
-# sanity check
-if cfg_bb is None:
-    fatal("Unable to open/parse %s" % os.path.join('conf', 'bitbake.conf'))
-    usage(1)
-
-rootfs = None
-extra_files = []
-
-if '--root' in opthash:
-    rootfs = opthash['--root']
-if '-r' in opthash:
-    rootfs = opthash['-r']
-
-if '--type' in opthash:
-    type = opthash['--type']
-if '-t' in opthash:
-    type = opthash['-t']
-
-if '--bbfile' in opthash:
-    extra_files.append(opthash['--bbfile'])
-if '-e' in opthash:
-    extra_files.append(opthash['-e'])
-
-for f in extra_files:
-    try:
-        cfg_bb = parse.handle(f, cfg_bb)
-    except IOError:
-        print "unable to open %s" % f
-
-if not rootfs:
-    rootfs = data.getVar('IMAGE_ROOTFS', cfg_bb, 1)
-
-if not rootfs:
-    bb.fatal("IMAGE_ROOTFS not defined")
-
-data.setVar('IMAGE_ROOTFS', rootfs, cfg_bb)
-
-from copy import copy, deepcopy
-localdata = data.createCopy(cfg_bb)
-
-overrides = data.getVar('OVERRIDES', localdata)
-if not overrides:
-    bb.fatal("OVERRIDES not defined.")
-data.setVar('OVERRIDES', '%s:%s' % (overrides, type), localdata)
-data.update_data(localdata)
-data.setVar('OVERRIDES', overrides, localdata)
-
-if '-n' in opthash:
-    data.setVar('IMAGE_NAME', opthash['-n'], localdata)
-if '--name' in opthash:
-    data.setVar('IMAGE_NAME', opthash['--name'], localdata)
-
-topdir = data.getVar('TOPDIR', localdata, 1) or os.getcwd()
-
-cmd = data.getVar('IMAGE_CMD', localdata, 1)
-if not cmd:
-    bb.fatal("IMAGE_CMD not defined")
-
-outdir = data.getVar('DEPLOY_DIR_IMAGE', localdata, 1)
-if not outdir:
-    bb.fatal('DEPLOY_DIR_IMAGE not defined')
-mkdirhier(outdir)
-
-#depends = data.getVar('IMAGE_DEPENDS', localdata, 1) or ""
-#if depends:
-#       bb.note("Spawning bbmake to satisfy dependencies: %s" % depends)
-#       ret = os.system('bbmake %s' % depends)
-#       if ret != 0:
-#           bb.error("executing bbmake to satisfy dependencies")
-
-bb.note("Executing %s" % cmd)
-data.setVar('image_cmd', cmd, localdata)
-data.setVarFlag('image_cmd', 'func', 1, localdata)
-try:
-    bb.build.exec_func('image_cmd', localdata)
-except bb.build.FuncFailed:
-    sys.exit(1)
-#ret = os.system(cmd)
-#sys.exit(ret)
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -22,12 +22,20 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

-import sys, os, getopt, re, time, optparse
+import sys, os, getopt, re, time, optparse, xmlrpclib
 sys.path.insert(0,os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])), 'lib'))
 import bb
 from bb import cooker
+from bb import ui
+from bb import server
+from bb.server import none
+#from bb.server import xmlrpc

-__version__ = "1.8.11"
+__version__ = "1.9.0"
+
+if sys.hexversion < 0x020500F0:
+    print "Sorry, python 2.5 or later is required for this version of bitbake"
+    sys.exit(1)

 #============================================================================#
 # BBOptions
@@ -41,11 +49,28 @@ class BBConfiguration( object ):
            setattr( self, key, val )


+def print_exception(exc, value, tb):
+    """
+    Print the exception to stderr, only showing the traceback if bitbake
+    debugging is enabled.
+    """
+    if not bb.msg.debug_level['default']:
+        tb = None
+
+    sys.__excepthook__(exc, value, tb)
+
+
 #============================================================================#
 # main
 #============================================================================#

 def main():
+    return_value = 0
+    pythonver = sys.version_info
+    if pythonver[0] < 2 or (pythonver[0] == 2 and pythonver[1] < 5):
+        print "Sorry, bitbake needs python 2.5 or later."
+        sys.exit(1)
+
    parser = optparse.OptionParser( version = "BitBake Build Tool Core version %s, %%prog version %s" % ( bb.__version__, __version__ ),
    usage = """%prog [options] [package ...]

@@ -60,6 +85,9 @@ Default BBFILES are the .bb files in the current directory.""" )
    parser.add_option( "-k", "--continue", help = "continue as much as possible after an error. While the target that failed, and those that depend on it, cannot be remade, the other dependencies of these targets can be processed all the same.",
               action = "store_false", dest = "abort", default = True )

+    parser.add_option( "-a", "--tryaltconfigs", help = "continue with builds by trying to use alternative providers where possible.",
+               action = "store_true", dest = "tryaltconfigs", default = False )
+
    parser.add_option( "-f", "--force", help = "force run of specified cmd, regardless of stamp status",
               action = "store_true", dest = "force", default = False )

@@ -96,8 +124,8 @@ Default BBFILES are the .bb files in the current directory.""" )
    parser.add_option( "-g", "--graphviz", help = "emit the dependency trees of the specified packages in the dot syntax",
                action = "store_true", dest = "dot_graph", default = False )

-    parser.add_option( "-I", "--ignore-deps", help = """Stop processing at the given list of dependencies when generating dependency graphs. This can help to make the graph more appealing""",
-                action = "append", dest = "ignored_dot_deps", default = [] )
+    parser.add_option( "-I", "--ignore-deps", help = """Assume these dependencies don't exist and are already provided (equivalent to ASSUME_PROVIDED). Useful to make dependency graphs more appealing""",
+                action = "append", dest = "extra_assume_provided", default = [] )

    parser.add_option( "-l", "--log-domains", help = """Show debug logging for the specified logging domains""",
                action = "append", dest = "debug_domains", default = [] )
@@ -105,30 +133,65 @@ Default BBFILES are the .bb files in the current directory.""" )
    parser.add_option( "-P", "--profile", help = "profile the command and print a report",
               action = "store_true", dest = "profile", default = False )

+    parser.add_option( "-u", "--ui", help = "userinterface to use",
+               action = "store", dest = "ui")
+
+    parser.add_option( "", "--revisions-changed", help = "Set the exit code depending on whether upstream floating revisions have changed or not",
+               action = "store_true", dest = "revisions_changed", default = False )
+
    options, args = parser.parse_args(sys.argv)

    configuration = BBConfiguration(options)
    configuration.pkgs_to_build = []
    configuration.pkgs_to_build.extend(args[1:])

-    cooker = bb.cooker.BBCooker(configuration)
+    #server = bb.server.xmlrpc
+    server = bb.server.none

-    if configuration.profile:
-        try:
-            import cProfile as profile
-        except:
-            import profile
+    # Save a logfile for cooker into the current working directory. When the
+    # server is daemonized this logfile will be truncated.
+    cooker_logfile = os.path.join (os.getcwd(), "cooker.log")

-        profile.runctx("cooker.cook()", globals(), locals(), "profile.log")
-        import pstats
-        p = pstats.Stats('profile.log')
-        p.sort_stats('time')
-        p.print_stats()
-        p.print_callers()
-        p.sort_stats('cumulative')
-        p.print_stats()
+    cooker = bb.cooker.BBCooker(configuration, server)
+
+    # Clear away any spurious environment variables. But don't wipe the
+    # environment totally. This is necessary to ensure the correct operation
+    # of the UIs (e.g. for DISPLAY, etc.)
+    bb.utils.clean_environment()
+
+    cooker.parseCommandLine()
+
+    serverinfo = server.BitbakeServerInfo(cooker.server)
+
+    server.BitBakeServerFork(serverinfo, cooker.serve, cooker_logfile)
+    del cooker
+
+    sys.excepthook = print_exception
+
+    # Setup a connection to the server (cooker)
+    serverConnection = server.BitBakeServerConnection(serverinfo)
+
+    # Launch the UI
+    if configuration.ui:
+        ui = configuration.ui
    else:
-        cooker.cook()
+        ui = "knotty"
+
+    try:
+            # Dynamically load the UI based on the ui name. Although we
+            # suggest a fixed set this allows you to have flexibility in which
+            # ones are available.
+            exec "from bb.ui import " + ui
+            exec "return_value = " + ui + ".init(serverConnection.connection, serverConnection.events)"
+    except ImportError:
+        print "FATAL: Invalid user interface '%s' specified. " % ui
+        print "Valid interfaces are 'ncurses', 'depexp' or the default, 'knotty'."
+    except Exception, e:
+        print "FATAL: Unable to start to '%s' UI due to exception: %s." % (configuration.ui, e)
+    finally:
+        serverConnection.terminate()
+        return return_value

 if __name__ == "__main__":
-    main()
+    ret = main()
+    sys.exit(ret)
--- a/bitbake/bin/bitdoc
+++ b/bitbake/bin/bitdoc
@@ -453,6 +453,8 @@ def main():
    except bb.parse.ParseError:
        bb.fatal( "Unable to parse %s" % config_file )

+    if isinstance(documentation, dict):
+        documentation = documentation[""]

    # Assuming we've the file loaded now, we will initialize the 'tree'
    doc = Documentation()
--- a/bitbake/contrib/vim/syntax/bitbake.vim
+++ b/bitbake/contrib/vim/syntax/bitbake.vim
@@ -16,12 +16,17 @@ endif

 syn case match

-
 " Catch incorrect syntax (only matches if nothing else does)
 "
 syn match bbUnmatched		"."


+syn include @python syntax/python.vim
+if exists("b:current_syntax")
+  unlet b:current_syntax
+endif
+
+
 " Other

 syn match bbComment		"^#.*$" display contains=bbTodo
@@ -34,21 +39,25 @@ syn match bbArrayBrackets	"[\[\]]" contained
 " BitBake strings

 syn match bbContinue		"\\$"
-syn region bbString		matchgroup=bbQuote start=/"/ skip=/\\$/ excludenl end=/"/ contained keepend contains=bbTodo,bbContinue,bbVarDeref
-syn region bbString		matchgroup=bbQuote start=/'/ skip=/\\$/ excludenl end=/'/ contained keepend contains=bbTodo,bbContinue,bbVarDeref
-
+syn region bbString		matchgroup=bbQuote start=/"/ skip=/\\$/ excludenl end=/"/ contained keepend contains=bbTodo,bbContinue,bbVarInlinePy,bbVarDeref
+syn region bbString		matchgroup=bbQuote start=/'/ skip=/\\$/ excludenl end=/'/ contained keepend contains=bbTodo,bbContinue,bbVarInlinePy,bbVarDeref

 " BitBake variable metadata

-syn keyword bbExportFlag	export contained nextgroup=bbIdentifier skipwhite
-syn match bbVarDeref	"${[a-zA-Z0-9\-_\.]\+}" contained
-syn match bbVarDef		"^\(export\s*\)\?\([a-zA-Z0-9\-_\.]\+\(_[${}a-zA-Z0-9\-_\.]\+\)\?\)\s*\(:=\|+=\|=+\|\.=\|=\.\|?=\|=\)\@=" contains=bbExportFlag,bbIdentifier,bbVarDeref nextgroup=bbVarEq
+syn match bbVarBraces "[\${}]"
+syn region bbVarDeref matchgroup=bbVarBraces start="${" end="}" contained
+" syn region bbVarDeref start="${" end="}" contained
+" syn region bbVarInlinePy start="${@" end="}" contained contains=@python
+syn region bbVarInlinePy matchgroup=bbVarBraces start="${@" end="}" contained contains=@python

-syn match bbIdentifier		"[a-zA-Z0-9\-_\.]\+" display contained
+syn keyword bbExportFlag	export contained nextgroup=bbIdentifier skipwhite
+" syn match bbVarDeref	"${[a-zA-Z0-9\-_\.]\+}" contained
+syn match bbVarDef		"^\(export\s*\)\?\([a-zA-Z0-9\-_\.]\+\(_[${}a-zA/-Z0-9\-_\.]\+\)\?\)\s*\(:=\|+=\|=+\|\.=\|=\.\|?=\|=\)\@=" contains=bbExportFlag,bbIdentifier,bbVarDeref nextgroup=bbVarEq
+
+syn match bbIdentifier		"[a-zA-Z0-9\-_\./]\+" display contained
 "syn keyword bbVarEq	= display contained nextgroup=bbVarValue
 syn match bbVarEq		"\(:=\|+=\|=+\|\.=\|=\.\|?=\|=\)" contained nextgroup=bbVarValue
-syn match bbVarValue		".*$" contained contains=bbString,bbVarDeref
-
+syn match bbVarValue		".*$" contained contains=bbString

 " BitBake variable metadata flags
 syn match bbVarFlagDef		"^\([a-zA-Z0-9\-_\.]\+\)\(\[[a-zA-Z0-9\-_\.]\+\]\)\@=" contains=bbIdentifier nextgroup=bbVarFlagFlag
@@ -61,10 +70,6 @@ syn match bbFunction	"\h\w*" display contained


 " BitBake python metadata
-syn include @python syntax/python.vim
-if exists("b:current_syntax")
-  unlet b:current_syntax
-endif

 syn keyword bbPythonFlag	python contained nextgroup=bbFunction
 syn match bbPythonFuncDef	"^\(python\s\+\)\(\w\+\)\?\(\s*()\s*\)\({\)\@=" contains=bbPythonFlag,bbFunction,bbDelimiter nextgroup=bbPythonFuncRegion skipwhite
@@ -98,7 +103,6 @@ syn match bbStatementRest		".*$" contained contains=bbString,bbVarDeref
 "
 hi def link bbArrayBrackets	Statement
 hi def link bbUnmatched		Error
-hi def link bbVarDeref		String
 hi def link bbContinue		Special
 hi def link bbDef		Statement
 hi def link bbPythonFlag	Type
@@ -116,5 +120,8 @@ hi def link bbIdentifier	Identifier
 hi def link bbVarEq		Operator
 hi def link bbQuote		String
 hi def link bbVarValue		String
+" hi def link bbVarInlinePy	PreProc
+hi def link bbVarDeref		PreProc
+hi def link bbVarBraces		PreProc

 let b:current_syntax = "bb"
--- a/bitbake/doc/bitbake.1
+++ b/bitbake/doc/bitbake.1
@@ -32,7 +32,7 @@ command.
 \fBbitbake\fP is a program that executes the specified task (default is 'build')
 for a given set of BitBake files.
 .br
-It expects that BBFILES is defined, which is a space seperated list of files to
+It expects that BBFILES is defined, which is a space separated list of files to
 be executed. BBFILES does support wildcards.
 .br
 Default BBFILES are the .bb files in the current directory.
@@ -54,6 +54,9 @@ continue as much as possible after an error. While the target that failed, and
 those that depend on it, cannot be remade, the other dependencies of these
 targets can be processed all the same.
 .TP
+.B \-a, \-\-tryaltconfigs
+continue with builds by trying to use alternative providers where possible.
+.TP
 .B \-f, \-\-force
 force run of specified cmd, regardless of stamp status
 .TP
@@ -64,7 +67,7 @@ drop into the interactive mode also called the BitBake shell.
 Specify task to execute. Note that this only executes the specified task for
 the providee and the packages it depends on, i.e. 'compile' does not implicitly
 call stage for the dependencies (IOW: use only if you know what you are doing).
-Depending on the base.bbclass a listtaks tasks is defined and will show
+Depending on the base.bbclass a listtasks task is defined and will show
 available tasks.
 .TP
 .B \-rFILE, \-\-read=FILE 
@@ -97,12 +100,13 @@ emit the dependency trees of the specified packages in the dot syntax
 .B \-IIGNORED\_DOT\_DEPS, \-\-ignore-deps=IGNORED_DOT_DEPS
 Stop processing at the given list of dependencies when generating dependency
 graphs. This can help to make the graph more appealing
-.\"
-.\" Next option is only in BitBake 1.7.x (trunk)
-.\"
-.\".TP
-.\".B \-lDEBUG_DOMAINS, \-\-log-domains=DEBUG_DOMAINS
-.\"Show debug logging for the specified logging domains
+.TP
+.B \-lDEBUG_DOMAINS, \-\-log-domains=DEBUG_DOMAINS
+Show debug logging for the specified logging domains
+.TP
+.B \-P, \-\-profile
+profile the command and print a report
+.TP

 .SH AUTHORS
 BitBake was written by 
--- a/bitbake/doc/manual/usermanual.xml
+++ b/bitbake/doc/manual/usermanual.xml
@@ -88,6 +88,17 @@ share common metadata between many packages.</para></listitem>
 <varname>B</varname> = "pre${A}post"</screen></para>
                <para>This results in <varname>A</varname> containing <literal>aval</literal> and <varname>B</varname> containing <literal>preavalpost</literal>.</para>
            </section>
+            <section>
+                <title>Setting a default value (?=)</title>
+                <para><screen><varname>A</varname> ?= "aval"</screen></para>
+                <para>If <varname>A</varname> is set before the above is called, it will retain it's previous value. If <varname>A</varname> is unset prior to the above call, <varname>A</varname> will be set to <literal>aval</literal>.  Note that this assignment is immediate, so if there are multiple ?= assignments to a single variable, the first of those will be used.</para>
+            </section>
+            <section>
+                <title>Setting a default value (??=)</title>
+                <para><screen><varname>A</varname> ??= "somevalue"</screen></para>
+                <para><screen><varname>A</varname> ??= "someothervalue"</screen></para>
+                <para>If <varname>A</varname> is set before the above, it will retain that value.  If <varname>A</varname> is unset prior to the above, <varname>A</varname> will be set to <literal>someothervalue</literal>.  This is a lazy version of ??=, in that the assignment does not occur until the end of the parsing process, so that the last, rather than the first, ??= assignment to a given variable will be used.</para>
+            </section>
            <section>
                <title>Immediate variable expansion (:=)</title>
                <para>:= results in a variable's contents being expanded immediately, rather than when the variable is actually used.</para>
@@ -119,7 +130,7 @@ will be introduced.</para>
            </section>
            <section>
                <title>Conditional metadata set</title>
-                <para>OVERRIDES is a <quote>:</quote> seperated variable containing each item you want to satisfy conditions.  So, if you have a variable which is conditional on <quote>arm</quote>, and <quote>arm</quote> is in OVERRIDES, then the <quote>arm</quote> specific version of the variable is used rather than the non-conditional version.  Example:</para>
+                <para>OVERRIDES is a <quote>:</quote> separated variable containing each item you want to satisfy conditions.  So, if you have a variable which is conditional on <quote>arm</quote>, and <quote>arm</quote> is in OVERRIDES, then the <quote>arm</quote> specific version of the variable is used rather than the non-conditional version.  Example:</para>
                <para><screen><varname>OVERRIDES</varname> = "architecture:os:machine"
 <varname>TEST</varname> = "defaultvalue"
 <varname>TEST_os</varname> = "osspecificvalue"
@@ -184,7 +195,7 @@ include</literal> directive.</para>
            <section>
                <title>Inheritance</title>
                <para><emphasis>NOTE:</emphasis> This is only supported in .bb and .bbclass files.</para>
-                <para>The <literal>inherit</literal> directive is a means of specifying what classes of functionality your .bb requires.  It is a rudamentary form of inheritence.  For example, you can easily abstract out the tasks involved in building a package that uses autoconf and automake, and put that into a bbclass for your packages to make use of.  A given bbclass is located by searching for classes/filename.oeclass in <envar>BBPATH</envar>, where filename is what you inherited.</para>
+                <para>The <literal>inherit</literal> directive is a means of specifying what classes of functionality your .bb requires.  It is a rudimentary form of inheritance.  For example, you can easily abstract out the tasks involved in building a package that uses autoconf and automake, and put that into a bbclass for your packages to make use of.  A given bbclass is located by searching for classes/filename.oeclass in <envar>BBPATH</envar>, where filename is what you inherited.</para>
            </section>
            <section>
                <title>Tasks</title>
@@ -217,6 +228,18 @@ This event handler gets called every time an event is triggered. A global variab
 method one can get the name of the triggered event.</para><para>The above event handler prints the name
 of the event and the content of the <varname>FILE</varname> variable.</para>
            </section>
+            <section>
+                <title>Variants</title>
+                <para>Two Bitbake features exist to facilitate the creation of multiple buildable incarnations from a single recipe file.</para>
+                <para>The first is <varname>BBCLASSEXTEND</varname>.  This variable is a space separated list of classes to utilize to "extend" the recipe for each variant.  As an example, setting <screen>BBCLASSEXTEND = "native"</screen> results in a second incarnation of the current recipe being available.  This second incarantion will have the "native" class inherited.</para>
+                <para>The second feature is <varname>BBVERSIONS</varname>.  This variable allows a single recipe to be able to build multiple versions of a project from a single recipe file, and allows you to specify conditional metadata (using the <varname>OVERRIDES</varname> mechanism) for a single version, or an optionally named range of versions:</para>
+                <para><screen>BBVERSIONS = "1.0 2.0 git"
+SRC_URI_git = "git://someurl/somepath.git"</screen></para>
+                <para><screen>BBVERSIONS = "1.0.[0-6]:1.0.0+ \
+              1.0.[7-9]:1.0.7+"
+SRC_URI_append_1.0.7+ = "file://some_patch_which_the_new_versions_need.patch;patch=1"</screen></para>
+                <para>Note that the name of the range will default to the original version of the recipe, so given OE, a recipe file of foo_1.0.0+.bb will default the name of its versions to 1.0.0+.  This is useful, as the range name is not only placed into overrides, it's also made available for the metadata to use in the form of the <varname>BPV</varname> variable, for use in file:// search paths (<varname>FILESPATH</varname>).</para>
+            </section>
        </section>
        <section>
            <title>Dependency Handling</title>
@@ -258,16 +281,18 @@ of the event and the content of the <varname>FILE</varname> variable.</para>
            <title>Parsing</title>
            <section>
                <title>Configuration Files</title>
-                <para>The first of the classifications of metadata in BitBake is configuration metadata.  This metadata is global, and therefore affects <emphasis>all</emphasis> packages and tasks which are executed.  Currently, BitBake has hardcoded knowledge of a single configuration file.  It expects to find 'conf/bitbake.conf' somewhere in the user specified <envar>BBPATH</envar>.  That configuration file generally has include directives to pull in any other metadata (generally files specific to architecture, machine, <emphasis>local</emphasis> and so on.</para>
+                <para>The first of the classifications of metadata in BitBake is configuration metadata.  This metadata is global, and therefore affects <emphasis>all</emphasis> packages and tasks which are executed.</para>
+                <para>Bitbake will first search the current working directory for an optional "conf/bblayers.conf" configuration file. This file is expected to contain a BBLAYERS variable which is a space delimited list of 'layer' directories. For each directory in this list a "conf/layer.conf" file will be searched for and parsed with the LAYERDIR variable being set to the directory where the layer was found. The idea is these files will setup BBPATH and other variables correctly for a given build directory automatically for the user.</para>
+                <para>Bitbake will then expect to find 'conf/bitbake.conf' somewhere in the user specified <envar>BBPATH</envar>.  That configuration file generally has include directives to pull in any other metadata (generally files specific to architecture, machine, <emphasis>local</emphasis> and so on.</para>
                <para>Only variable definitions and include directives are allowed in .conf files.</para>
            </section>
            <section>
                <title>Classes</title>
-                <para>BitBake classes are our rudamentary inheritence mechanism.  As briefly mentioned in the metadata introduction, they're parsed when an <literal>inherit</literal> directive is encountered, and they are located in classes/ relative to the dirs in <envar>BBPATH</envar>.</para>
+                <para>BitBake classes are our rudimentary inheritance mechanism.  As briefly mentioned in the metadata introduction, they're parsed when an <literal>inherit</literal> directive is encountered, and they are located in classes/ relative to the dirs in <envar>BBPATH</envar>.</para>
            </section>
            <section>
                <title>.bb Files</title>
-                <para>A BitBake (.bb) file is a logical unit of tasks to be executed.  Normally this is a package to be built.  Inter-.bb dependencies are obeyed.  The files themselves are located via the <varname>BBFILES</varname> variable, which is set to a space seperated list of .bb files, and does handle wildcards.</para>
+                <para>A BitBake (.bb) file is a logical unit of tasks to be executed.  Normally this is a package to be built.  Inter-.bb dependencies are obeyed.  The files themselves are located via the <varname>BBFILES</varname> variable, which is set to a space separated list of .bb files, and does handle wildcards.</para>
            </section>
        </section>
    </chapter>
@@ -352,15 +377,7 @@ will be tried first when fetching a file if that fails the actual file will be t


    <chapter>
-        <title>Commands</title>
-        <section>
-            <title>bbread</title>
-            <para>bbread is a command for displaying BitBake metadata.  When run with no arguments, it has the core parse 'conf/bitbake.conf', as located in BBPATH, and displays that.  If you supply a file on the commandline, such as a .bb, then it parses that afterwards, using the aforementioned configuration metadata.</para>
-        <para><emphasis>NOTE: the stand a lone bbread command was removed. Instead of bbread use bitbake -e.
-        </emphasis></para>
-        </section>
-        <section>
-            <title>bitbake</title>
+        <title>The bitbake command</title>
            <section>
                <title>Introduction</title>
                <para>bitbake is the primary command in the system.  It facilitates executing tasks in a single .bb file, or executing a given task on a set of multiple .bb files, accounting for interdependencies amongst them.</para>
@@ -372,7 +389,7 @@ will be tried first when fetching a file if that fails the actual file will be t
 usage: bitbake [options] [package ...]

 Executes the specified task (default is 'build') for a given set of BitBake files.
-It expects that BBFILES is defined, which is a space seperated list of files to
+It expects that BBFILES is defined, which is a space separated list of files to
 be executed.  BBFILES does support wildcards.
 Default BBFILES are the .bb files in the current directory.

@@ -394,7 +411,7 @@ options:
                        it depends on, i.e. 'compile' does not implicitly call
                        stage for the dependencies (IOW: use only if you know
                        what you are doing). Depending on the base.bbclass a
-                        listtasks tasks is defined and will show available
+                        listtasks task is defined and will show available
                        tasks
  -r FILE, --read=FILE  read the specified file before bitbake.conf
  -v, --verbose         output more chit-chat to the terminal
@@ -415,6 +432,8 @@ options:
                        the graph more appealing
  -l DEBUG_DOMAINS, --log-domains=DEBUG_DOMAINS
                        Show debug logging for the specified logging domains
+  -P, --profile         profile the command and print a report
+

 </screen>
                </para>
@@ -461,12 +480,12 @@ Two files will be written into the current working directory, <emphasis>depends.
            </section>
            <section>
                <title>Metadata</title>
-                <para>As you may have seen in the usage information, or in the information about .bb files, the BBFILES variable is how the bitbake tool locates its files.  This variable is a space seperated list of files that are available, and supports wildcards.
+                <para>As you may have seen in the usage information, or in the information about .bb files, the BBFILES variable is how the bitbake tool locates its files.  This variable is a space separated list of files that are available, and supports wildcards.
                <example>
                    <title>Setting BBFILES</title>
                    <programlisting><varname>BBFILES</varname> = "/path/to/bbfiles/*.bb"</programlisting>
                </example></para>
-                <para>With regard to dependencies, it expects the .bb to define a <varname>DEPENDS</varname> variable, which contains a space seperated list of <quote>package names</quote>, which themselves are the <varname>PN</varname> variable.  The <varname>PN</varname> variable is, in general, by default, set to a component of the .bb filename.</para>
+                <para>With regard to dependencies, it expects the .bb to define a <varname>DEPENDS</varname> variable, which contains a space separated list of <quote>package names</quote>, which themselves are the <varname>PN</varname> variable.  The <varname>PN</varname> variable is, in general, by default, set to a component of the .bb filename.</para>
                <example>
                    <title>Depending on another .bb</title>
                    <para>a.bb:
@@ -513,6 +532,5 @@ BBFILE_PRIORITY_upstream = "5"
 BBFILE_PRIORITY_local = "10"</screen>
                </example>
            </section>
-        </section>
    </chapter>
 </book>
--- a/bitbake/lib/bb/COW.py
+++ b/bitbake/lib/bb/COW.py
@@ -23,10 +23,8 @@
 # Assign a file to __warn__ to get warnings about slow operations.
 #

-from inspect import getmro
-
 import copy
-import types, sets
+import types
 types.ImmutableTypes = tuple([ \
    types.BooleanType, \
    types.ComplexType, \
@@ -35,7 +33,7 @@ types.ImmutableTypes = tuple([ \
    types.LongType, \
    types.NoneType, \
    types.TupleType, \
-    sets.ImmutableSet] + \
+    frozenset] + \
    list(types.StringTypes))

 MUTABLE = "__mutable__"
--- a/bitbake/lib/bb/init.py
+++ b/bitbake/lib/bb/init.py
--- a/bitbake/lib/bb/build.py
+++ b/bitbake/lib/bb/build.py
@@ -25,12 +25,23 @@
 #
 #Based on functions from the base bb module, Copyright 2003 Holger Schurig

-from bb import data, fetch, event, mkdirhier, utils
-import bb, os
+from bb import data, event, mkdirhier, utils
+import bb, os, sys
+
+# When we execute a python function we'd like certain things 
+# in all namespaces, hence we add them to __builtins__
+# If we do not do this and use the exec globals, they will
+# not be available to subfunctions.
+__builtins__['bb'] = bb
+__builtins__['os'] = os

 # events
 class FuncFailed(Exception):
-    """Executed function failed"""
+    """
+    Executed function failed
+    First parameter a message
+    Second paramter is a logfile (optional)
+    """

 class EventException(Exception):
    """Exception which is associated with an Event."""
@@ -43,7 +54,9 @@ class TaskBase(event.Event):

    def __init__(self, t, d ):
        self._task = t
-        event.Event.__init__(self, d)
+        self._package = bb.data.getVar("PF", d, 1)
+        event.Event.__init__(self)
+        self._message = "package %s: task %s: %s" % (bb.data.getVar("PF", d, 1), t, bb.event.getName(self)[4:])

    def getTask(self):
        return self._task
@@ -61,6 +74,10 @@ class TaskSucceeded(TaskBase):

 class TaskFailed(TaskBase):
    """Task execution failed"""
+    def __init__(self, msg, logfile, t, d ):
+        self.logfile = logfile
+        self.msg = msg
+        TaskBase.__init__(self, t, d)

 class InvalidTask(TaskBase):
    """Invalid Task"""
@@ -74,12 +91,21 @@ def exec_func(func, d, dirs = None):
    if not body:
        return

-    cleandirs = (data.expand(data.getVarFlag(func, 'cleandirs', d), d) or "").split()
+    flags = data.getVarFlags(func, d)
+    for item in ['deps', 'check', 'interactive', 'python', 'cleandirs', 'dirs', 'lockfiles', 'fakeroot']:
+        if not item in flags:
+            flags[item] = None
+
+    ispython = flags['python']
+
+    cleandirs = (data.expand(flags['cleandirs'], d) or "").split()
    for cdir in cleandirs:
        os.system("rm -rf %s" % cdir)

-    if not dirs:
-        dirs = (data.expand(data.getVarFlag(func, 'dirs', d), d) or "").split()
+    if dirs:
+        dirs = data.expand(dirs, d)
+    else:
+        dirs = (data.expand(flags['dirs'], d) or "").split()
    for adir in dirs:
        mkdirhier(adir)

@@ -88,48 +114,114 @@ def exec_func(func, d, dirs = None):
    else:
        adir = data.getVar('B', d, 1)

-    adir = data.expand(adir, d)
-
+    # Save current directory
    try:
        prevdir = os.getcwd()
    except OSError:
-        prevdir = data.expand('${TOPDIR}', d)
+        prevdir = data.getVar('TOPDIR', d, True)
+
+    # Setup logfiles
+    t = data.getVar('T', d, 1)
+    if not t:
+        bb.msg.fatal(bb.msg.domain.Build, "T not set")
+    mkdirhier(t)
+    logfile = "%s/log.%s.%s" % (t, func, str(os.getpid()))
+    runfile = "%s/run.%s.%s" % (t, func, str(os.getpid()))
+
+    # Change to correct directory (if specified)
    if adir and os.access(adir, os.F_OK):
        os.chdir(adir)

+    # Handle logfiles
+    si = file('/dev/null', 'r')
+    try:
+        if bb.msg.debug_level['default'] > 0 or ispython:
+            so = os.popen("tee \"%s\"" % logfile, "w")
+        else:
+            so = file(logfile, 'w')
+    except OSError, e:
+        bb.msg.error(bb.msg.domain.Build, "opening log file: %s" % e)
+        pass
+
+    se = so
+
+    # Dup the existing fds so we dont lose them
+    osi = [os.dup(sys.stdin.fileno()), sys.stdin.fileno()]
+    oso = [os.dup(sys.stdout.fileno()), sys.stdout.fileno()]
+    ose = [os.dup(sys.stderr.fileno()), sys.stderr.fileno()]
+
+    # Replace those fds with our own
+    os.dup2(si.fileno(), osi[1])
+    os.dup2(so.fileno(), oso[1])
+    os.dup2(se.fileno(), ose[1])
+
    locks = []
-    lockfiles = (data.expand(data.getVarFlag(func, 'lockfiles', d), d) or "").split()
+    lockfiles = (data.expand(flags['lockfiles'], d) or "").split()
    for lock in lockfiles:
        locks.append(bb.utils.lockfile(lock))

-    if data.getVarFlag(func, "python", d):
-        exec_func_python(func, d)
-    else:
-        exec_func_shell(func, d)
+    try:
+        # Run the function
+        if ispython:
+            exec_func_python(func, d, runfile, logfile)
+        else:
+            exec_func_shell(func, d, runfile, logfile, flags)

-    for lock in locks:
-        bb.utils.unlockfile(lock)
+        # Restore original directory
+        try:
+            os.chdir(prevdir)
+        except:
+            pass

-    if os.path.exists(prevdir):
-        os.chdir(prevdir)
+    finally:

-def exec_func_python(func, d):
+        # Unlock any lockfiles
+        for lock in locks:
+            bb.utils.unlockfile(lock)
+
+        # Restore the backup fds
+        os.dup2(osi[0], osi[1])
+        os.dup2(oso[0], oso[1])
+        os.dup2(ose[0], ose[1])
+
+        # Close our logs
+        si.close()
+        so.close()
+        se.close()
+
+        if os.path.exists(logfile) and os.path.getsize(logfile) == 0:
+            bb.msg.debug(2, bb.msg.domain.Build, "Zero size logfile %s, removing" % logfile)
+            os.remove(logfile)
+
+        # Close the backup fds
+        os.close(osi[0])
+        os.close(oso[0])
+        os.close(ose[0])
+
+def exec_func_python(func, d, runfile, logfile):
    """Execute a python BB 'function'"""
    import re, os

+    bbfile = bb.data.getVar('FILE', d, 1)
    tmp  = "def " + func + "():\n%s" % data.getVar(func, d)
    tmp += '\n' + func + '()'
-    comp = utils.better_compile(tmp, func, bb.data.getVar('FILE', d, 1) )
-    prevdir = os.getcwd()
-    g = {} # globals
-    g['bb'] = bb
-    g['os'] = os
-    g['d'] = d
-    utils.better_exec(comp,g,tmp, bb.data.getVar('FILE',d,1))
-    if os.path.exists(prevdir):
-        os.chdir(prevdir)

-def exec_func_shell(func, d):
+    f = open(runfile, "w")
+    f.write(tmp)
+    comp = utils.better_compile(tmp, func, bbfile)
+    g = {} # globals
+    g['d'] = d
+    try:
+        utils.better_exec(comp, g, tmp, bbfile)
+    except:
+        (t,value,tb) = sys.exc_info()
+
+        if t in [bb.parse.SkipPackage, bb.build.FuncFailed]:
+            raise
+        bb.msg.error(bb.msg.domain.Build, "Function %s failed" % func)
+        raise FuncFailed("function %s failed" % func, logfile)
+
+def exec_func_shell(func, d, runfile, logfile, flags):
    """Execute a shell BB 'function' Returns true if execution was successful.

    For this, it creates a bash shell script in the tmp dectory, writes the local
@@ -139,23 +231,13 @@ def exec_func_shell(func, d):
    of the directories you need created prior to execution.  The last
    item in the list is where we will chdir/cd to.
    """
-    import sys

-    deps = data.getVarFlag(func, 'deps', d)
-    check = data.getVarFlag(func, 'check', d)
-    interact = data.getVarFlag(func, 'interactive', d)
+    deps = flags['deps']
+    check = flags['check']
    if check in globals():
        if globals()[check](func, deps):
            return

-    global logfile
-    t = data.getVar('T', d, 1)
-    if not t:
-        return 0
-    mkdirhier(t)
-    logfile = "%s/log.%s.%s" % (t, func, str(os.getpid()))
-    runfile = "%s/run.%s.%s" % (t, func, str(os.getpid()))
-
    f = open(runfile, "w")
    f.write("#!/bin/sh -e\n")
    if bb.msg.debug_level['default'] > 0: f.write("set -x\n")
@@ -167,85 +249,21 @@ def exec_func_shell(func, d):
    os.chmod(runfile, 0775)
    if not func:
        bb.msg.error(bb.msg.domain.Build, "Function not specified")
-        raise FuncFailed()
-
-    # open logs
-    si = file('/dev/null', 'r')
-    try:
-        if bb.msg.debug_level['default'] > 0:
-            so = os.popen("tee \"%s\"" % logfile, "w")
-        else:
-            so = file(logfile, 'w')
-    except OSError, e:
-        bb.msg.error(bb.msg.domain.Build, "opening log file: %s" % e)
-        pass
-
-    se = so
-
-    if not interact:
-        # dup the existing fds so we dont lose them
-        osi = [os.dup(sys.stdin.fileno()), sys.stdin.fileno()]
-        oso = [os.dup(sys.stdout.fileno()), sys.stdout.fileno()]
-        ose = [os.dup(sys.stderr.fileno()), sys.stderr.fileno()]
-
-        # replace those fds with our own
-        os.dup2(si.fileno(), osi[1])
-        os.dup2(so.fileno(), oso[1])
-        os.dup2(se.fileno(), ose[1])
+        raise FuncFailed("Function not specified for exec_func_shell")

    # execute function
-    prevdir = os.getcwd()
-    if data.getVarFlag(func, "fakeroot", d):
+    if flags['fakeroot']:
        maybe_fakeroot = "PATH=\"%s\" fakeroot " % bb.data.getVar("PATH", d, 1)
    else:
        maybe_fakeroot = ''
    lang_environment = "LC_ALL=C "
    ret = os.system('%s%ssh -e %s' % (lang_environment, maybe_fakeroot, runfile))
-    try:
-        os.chdir(prevdir)
-    except:
-        pass

-    if not interact:
-        # restore the backups
-        os.dup2(osi[0], osi[1])
-        os.dup2(oso[0], oso[1])
-        os.dup2(ose[0], ose[1])
-
-        # close our logs
-        si.close()
-        so.close()
-        se.close()
-
-        # close the backup fds
-        os.close(osi[0])
-        os.close(oso[0])
-        os.close(ose[0])
-
-    if ret==0:
-        if bb.msg.debug_level['default'] > 0:
-            os.remove(runfile)
-#            os.remove(logfile)
+    if ret == 0:
        return
-    else:
-        bb.msg.error(bb.msg.domain.Build, "function %s failed" % func)
-        if data.getVar("BBINCLUDELOGS", d):
-            bb.msg.error(bb.msg.domain.Build, "log data follows (%s)" % logfile)
-            number_of_lines = data.getVar("BBINCLUDELOGS_LINES", d)
-            if number_of_lines:
-                os.system('tail -n%s %s' % (number_of_lines, logfile))
-            else:
-                f = open(logfile, "r")
-                while True:
-                    l = f.readline()
-                    if l == '':
-                        break
-                    l = l.rstrip()
-                    print '| %s' % l
-                f.close()
-        else:
-            bb.msg.error(bb.msg.domain.Build, "see log in %s" % logfile)
-        raise FuncFailed( logfile )
+
+    bb.msg.error(bb.msg.domain.Build, "Function %s failed" % func)
+    raise FuncFailed("function %s failed" % func, logfile)


 def exec_task(task, d):
@@ -255,72 +273,36 @@ def exec_task(task, d):
       a function is that a task exists in the task digraph, and therefore
       has dependencies amongst other tasks."""

-    # check if the task is in the graph..
-    task_graph = data.getVar('_task_graph', d)
-    if not task_graph:
-        task_graph = bb.digraph()
-        data.setVar('_task_graph', task_graph, d)
-    task_cache = data.getVar('_task_cache', d)
-    if not task_cache:
-        task_cache = []
-        data.setVar('_task_cache', task_cache, d)
-    if not task_graph.hasnode(task):
-        raise EventException("Missing node in task graph", InvalidTask(task, d))
+    # Check whther this is a valid task
+    if not data.getVarFlag(task, 'task', d):
+        raise EventException("No such task", InvalidTask(task, d))

-    # check whether this task needs executing..
-    if stamp_is_current(task, d):
-        return 1
-
-    # follow digraph path up, then execute our way back down
-    def execute(graph, item):
-        if data.getVarFlag(item, 'task', d):
-            if item in task_cache:
-                return 1
-
-            if task != item:
-                # deeper than toplevel, exec w/ deps
-                exec_task(item, d)
-                return 1
-
-            try:
-                bb.msg.debug(1, bb.msg.domain.Build, "Executing task %s" % item)
-                old_overrides = data.getVar('OVERRIDES', d, 0)
-                localdata = data.createCopy(d)
-                data.setVar('OVERRIDES', 'task_%s:%s' % (item, old_overrides), localdata)
-                data.update_data(localdata)
-                event.fire(TaskStarted(item, localdata))
-                exec_func(item, localdata)
-                event.fire(TaskSucceeded(item, localdata))
-                task_cache.append(item)
-                data.setVar('_task_cache', task_cache, d)
-            except FuncFailed, reason:
-                bb.msg.note(1, bb.msg.domain.Build, "Task failed: %s" % reason )
-                failedevent = TaskFailed(item, d)
-                event.fire(failedevent)
-                raise EventException("Function failed in task: %s" % reason, failedevent)
-
-    if data.getVarFlag(task, 'dontrundeps', d):
-        execute(None, task)
-    else:
-        task_graph.walkdown(task, execute)
+    try:
+        bb.msg.debug(1, bb.msg.domain.Build, "Executing task %s" % task)
+        old_overrides = data.getVar('OVERRIDES', d, 0)
+        localdata = data.createCopy(d)
+        data.setVar('OVERRIDES', 'task-%s:%s' % (task[3:], old_overrides), localdata)
+        data.update_data(localdata)
+        data.expandKeys(localdata)
+        event.fire(TaskStarted(task, localdata), localdata)
+        exec_func(task, localdata)
+        event.fire(TaskSucceeded(task, localdata), localdata)
+    except FuncFailed, message:
+        # Try to extract the optional logfile
+        try:
+            (msg, logfile) = message
+        except:
+            logfile = None
+            msg = message
+        bb.msg.note(1, bb.msg.domain.Build, "Task failed: %s" % message )
+        failedevent = TaskFailed(msg, logfile, task, d)
+        event.fire(failedevent, d)
+        raise EventException("Function failed in task: %s" % message, failedevent)

    # make stamp, or cause event and raise exception
    if not data.getVarFlag(task, 'nostamp', d) and not data.getVarFlag(task, 'selfstamp', d):
        make_stamp(task, d)

-def extract_stamp_data(d, fn):
-    """
-    Extracts stamp data from d which is either a data dictonary (fn unset) 
-    or a dataCache entry (fn set). 
-    """
-    if fn:
-        return (d.task_queues[fn], d.stamp[fn], d.task_deps[fn])
-    task_graph = data.getVar('_task_graph', d)
-    if not task_graph:
-        task_graph = bb.digraph()
-        data.setVar('_task_graph', task_graph, d)
-    return (task_graph, data.getVar('STAMP', d, 1), None)
-
 def extract_stamp(d, fn):
    """
    Extracts stamp format which is either a data dictonary (fn unset) 
@@ -330,49 +312,6 @@ def extract_stamp(d, fn):
        return d.stamp[fn]
    return data.getVar('STAMP', d, 1)

-def stamp_is_current(task, d, file_name = None, checkdeps = 1):
-    """
-    Check status of a given task's stamp. 
-    Returns 0 if it is not current and needs updating.
-    (d can be a data dict or dataCache)
-    """
-
-    (task_graph, stampfn, taskdep) = extract_stamp_data(d, file_name)
-
-    if not stampfn:
-        return 0
-
-    stampfile = "%s.%s" % (stampfn, task)
-    if not os.access(stampfile, os.F_OK):
-        return 0
-
-    if checkdeps == 0:
-        return 1
-
-    import stat
-    tasktime = os.stat(stampfile)[stat.ST_MTIME]
-
-    _deps = []
-    def checkStamp(graph, task):
-        # check for existance
-        if file_name:
-            if 'nostamp' in taskdep and task in taskdep['nostamp']:
-                return 1
-        else:
-            if data.getVarFlag(task, 'nostamp', d):
-                return 1
-
-        if not stamp_is_current(task, d, file_name, 0						):
-            return 0
-
-        depfile = "%s.%s" % (stampfn, task)
-        deptime = os.stat(depfile)[stat.ST_MTIME]
-        if deptime > tasktime:
-            return 0
-        return 1
-
-    return task_graph.walkdown(task, checkStamp)
-
 def stamp_internal(task, d, file_name):
    """
    Internal stamp helper function
@@ -409,40 +348,39 @@ def del_stamp(task, d, file_name = None):
    stamp_internal(task, d, file_name)

 def add_tasks(tasklist, d):
-    task_graph = data.getVar('_task_graph', d)
    task_deps = data.getVar('_task_deps', d)
-    if not task_graph:
-        task_graph = bb.digraph()
    if not task_deps:
        task_deps = {}
+    if not 'tasks' in task_deps:
+        task_deps['tasks'] = []
+    if not 'parents' in task_deps:
+        task_deps['parents'] = {}

    for task in tasklist:
-        deps = tasklist[task]
        task = data.expand(task, d)
-
        data.setVarFlag(task, 'task', 1, d)
-        task_graph.addnode(task, None)
-        for dep in deps:
-            dep = data.expand(dep, d)
-            if not task_graph.hasnode(dep):
-                task_graph.addnode(dep, None)
-            task_graph.addnode(task, dep)
+
+        if not task in task_deps['tasks']:
+            task_deps['tasks'].append(task)

        flags = data.getVarFlags(task, d)    
        def getTask(name):
+            if not name in task_deps:
+                task_deps[name] = {}
            if name in flags:
                deptask = data.expand(flags[name], d)
-                if not name in task_deps:
-                    task_deps[name] = {}
                task_deps[name][task] = deptask
        getTask('depends')
        getTask('deptask')
        getTask('rdeptask')
        getTask('recrdeptask')
        getTask('nostamp')
+        task_deps['parents'][task] = []
+        for dep in flags['deps']:
+            dep = data.expand(dep, d)
+            task_deps['parents'][task].append(dep)

    # don't assume holding a reference
-    data.setVar('_task_graph', task_graph, d)
    data.setVar('_task_deps', task_deps, d)

 def remove_task(task, kill, d):
@@ -450,22 +388,5 @@ def remove_task(task, kill, d):

       If kill is 1, also remove tasks that depend on this task."""

-    task_graph = data.getVar('_task_graph', d)
-    if not task_graph:
-        task_graph = bb.digraph()
-    if not task_graph.hasnode(task):
-        return
-
    data.delVarFlag(task, 'task', d)
-    ref = 1
-    if kill == 1:
-        ref = 2
-    task_graph.delnode(task, ref)
-    data.setVar('_task_graph', task_graph, d)

-def task_exists(task, d):
-    task_graph = data.getVar('_task_graph', d)
-    if not task_graph:
-        task_graph = bb.digraph()
-        data.setVar('_task_graph', task_graph, d)
-    return task_graph.hasnode(task)
--- a/bitbake/lib/bb/cache.py
+++ b/bitbake/lib/bb/cache.py
@@ -31,7 +31,6 @@
 import os, re
 import bb.data
 import bb.utils
-from sets import Set

 try:
    import cPickle as pickle
@@ -39,7 +38,7 @@ except ImportError:
    import pickle
    bb.msg.note(1, bb.msg.domain.Cache, "Importing cPickle failed. Falling back to a very slow implementation.")

-__cache_version__ = "127"
+__cache_version__ = "131"

 class Cache:
    """
@@ -50,26 +49,37 @@ class Cache:

        self.cachedir = bb.data.getVar("CACHE", cooker.configuration.data, True)
        self.clean = {}
+        self.checked = {}
        self.depends_cache = {}
        self.data = None
        self.data_fn = None
+        self.cacheclean = True

        if self.cachedir in [None, '']:
            self.has_cache = False
            bb.msg.note(1, bb.msg.domain.Cache, "Not using a cache. Set CACHE = <directory> to enable.")
-        else:
-            self.has_cache = True
-            self.cachefile = os.path.join(self.cachedir,"bb_cache.dat")
-            
-            bb.msg.debug(1, bb.msg.domain.Cache, "Using cache in '%s'" % self.cachedir)
-            try:
-                os.stat( self.cachedir )
-            except OSError:
-                bb.mkdirhier( self.cachedir )
+            return

-        if self.has_cache and (self.mtime(self.cachefile)):
+        self.has_cache = True
+        self.cachefile = os.path.join(self.cachedir,"bb_cache.dat")
+
+        bb.msg.debug(1, bb.msg.domain.Cache, "Using cache in '%s'" % self.cachedir)
+        try:
+            os.stat( self.cachedir )
+        except OSError:
+            bb.mkdirhier( self.cachedir )
+
+        # If any of configuration.data's dependencies are newer than the
+        # cache there isn't even any point in loading it...
+        newest_mtime = 0
+        deps = bb.data.getVar("__depends", cooker.configuration.data, True)
+        for f,old_mtime in deps:
+            if old_mtime > newest_mtime:
+                newest_mtime = old_mtime
+
+        if bb.parse.cached_mtime_noerror(self.cachefile) >= newest_mtime:
            try:
-                p = pickle.Unpickler( file(self.cachefile,"rb"))
+                p = pickle.Unpickler(file(self.cachefile, "rb"))
                self.depends_cache, version_data = p.load()
                if version_data['CACHE_VER'] != __cache_version__:
                    raise ValueError, 'Cache Version Mismatch'
@@ -78,14 +88,15 @@ class Cache:
            except EOFError:
                bb.msg.note(1, bb.msg.domain.Cache, "Truncated cache found, rebuilding...")
                self.depends_cache = {}
-            except (ValueError, KeyError):
+            except:
                bb.msg.note(1, bb.msg.domain.Cache, "Invalid cache found, rebuilding...")
                self.depends_cache = {}
-
-        if self.depends_cache:
-            for fn in self.depends_cache.keys():
-                self.clean[fn] = ""
-                self.cacheValidUpdate(fn)
+        else:
+            try:
+                os.stat( self.cachefile )
+                bb.msg.note(1, bb.msg.domain.Cache, "Out of date cache found, rebuilding...")
+            except OSError:
+                pass

    def getVar(self, var, fn, exp = 0):
        """
@@ -97,7 +108,6 @@ class Cache:
          2. We're learning what data to cache - serve from data 
             backend but add a copy of the data to the cache.
        """
-
        if fn in self.clean:
            return self.depends_cache[fn][var]

@@ -109,32 +119,72 @@ class Cache:
            # yet setData hasn't been called to setup the right access. Very bad.
            bb.msg.error(bb.msg.domain.Cache, "Parsing error data_fn %s and fn %s don't match" % (self.data_fn, fn))

+        self.cacheclean = False
        result = bb.data.getVar(var, self.data, exp)
        self.depends_cache[fn][var] = result
        return result

-    def setData(self, fn, data):
+    def setData(self, virtualfn, fn, data):
        """
        Called to prime bb_cache ready to learn which variables to cache.
        Will be followed by calls to self.getVar which aren't cached
        but can be fulfilled from self.data.
        """
-        self.data_fn = fn
+        self.data_fn = virtualfn
        self.data = data

        # Make sure __depends makes the depends_cache
-        self.getVar("__depends", fn, True)
-        self.depends_cache[fn]["CACHETIMESTAMP"] = bb.parse.cached_mtime(fn)
+        # If we're a virtual class we need to make sure all our depends are appended 
+        # to the depends of fn.
+        depends = self.getVar("__depends", virtualfn, True) or []
+        if "__depends" not in self.depends_cache[fn] or not self.depends_cache[fn]["__depends"]:
+            self.depends_cache[fn]["__depends"] = depends
+        for dep in depends:
+            if dep not in self.depends_cache[fn]["__depends"]:
+                self.depends_cache[fn]["__depends"].append(dep)

-    def loadDataFull(self, fn, cfgData):
+        # Make sure the variants always make it into the cache too
+        self.getVar('__VARIANTS', virtualfn, True)
+
+        self.depends_cache[virtualfn]["CACHETIMESTAMP"] = bb.parse.cached_mtime(fn)
+
+    def virtualfn2realfn(self, virtualfn):
+        """
+        Convert a virtual file name to a real one + the associated subclass keyword
+        """
+
+        fn = virtualfn
+        cls = ""
+        if virtualfn.startswith('virtual:'):
+            cls = virtualfn.split(':', 2)[1]
+            fn = virtualfn.replace('virtual:' + cls + ':', '')
+        #bb.msg.debug(2, bb.msg.domain.Cache, "virtualfn2realfn %s to %s %s" % (virtualfn, fn, cls))
+        return (fn, cls)
+
+    def realfn2virtual(self, realfn, cls):
+        """
+        Convert a real filename + the associated subclass keyword to a virtual filename
+        """
+        if cls == "":
+            #bb.msg.debug(2, bb.msg.domain.Cache, "realfn2virtual %s and '%s' to %s" % (realfn, cls, realfn))
+            return realfn
+        #bb.msg.debug(2, bb.msg.domain.Cache, "realfn2virtual %s and %s to %s" % (realfn, cls, "virtual:" + cls + ":" + realfn))
+        return "virtual:" + cls + ":" + realfn
+
+    def loadDataFull(self, virtualfn, cfgData):
        """
        Return a complete set of data for fn.
        To do this, we need to parse the file.
        """
-        bb_data, skipped = self.load_bbfile(fn, cfgData)
-        return bb_data

-    def loadData(self, fn, cfgData):
+        (fn, cls) = self.virtualfn2realfn(virtualfn)
+
+        bb.msg.debug(1, bb.msg.domain.Cache, "Parsing %s (full)" % fn)
+
+        bb_data = self.load_bbfile(fn, cfgData)
+        return bb_data[cls]
+
+    def loadData(self, fn, cfgData, cacheData):
        """
        Load a subset of data for fn.
        If the cached data is valid we do nothing,
@@ -142,14 +192,39 @@ class Cache:
        to record the variables accessed.
        Return the cache status and whether the file was skipped when parsed
        """
-        if self.cacheValid(fn):
-            if "SKIPPED" in self.depends_cache[fn]:
-                return True, True
-            return True, False
+        skipped = 0
+        virtuals = 0
+
+        if fn not in self.checked:
+            self.cacheValidUpdate(fn)
+
+        if self.cacheValid(fn):
+            multi = self.getVar('__VARIANTS', fn, True)
+            for cls in (multi or "").split() + [""]:
+                virtualfn = self.realfn2virtual(fn, cls)
+                if self.depends_cache[virtualfn]["__SKIPPED"]:
+                    skipped += 1
+                    bb.msg.debug(1, bb.msg.domain.Cache, "Skipping %s" % virtualfn)
+                    continue
+                self.handle_data(virtualfn, cacheData)
+                virtuals += 1
+            return True, skipped, virtuals
+
+        bb.msg.debug(1, bb.msg.domain.Cache, "Parsing %s" % fn)
+
+        bb_data = self.load_bbfile(fn, cfgData)
+
+        for data in bb_data:
+            virtualfn = self.realfn2virtual(fn, data)
+            self.setData(virtualfn, fn, bb_data[data])
+            if self.getVar("__SKIPPED", virtualfn, True):
+                skipped += 1
+                bb.msg.debug(1, bb.msg.domain.Cache, "Skipping %s" % virtualfn)
+            else:
+                self.handle_data(virtualfn, cacheData)
+                virtuals += 1
+        return False, skipped, virtuals

-        bb_data, skipped = self.load_bbfile(fn, cfgData)
-        self.setData(fn, bb_data)
-        return False, skipped

    def cacheValid(self, fn):
        """
@@ -172,11 +247,10 @@ class Cache:
        if not self.has_cache:
            return False

-        # Check file still exists
-        if self.mtime(fn) == 0:
-            bb.msg.debug(2, bb.msg.domain.Cache, "Cache: %s not longer exists" % fn)
-            self.remove(fn)
-            return False
+        self.checked[fn] = ""
+
+        # Pretend we're clean so getVar works
+        self.clean[fn] = ""

        # File isn't in depends_cache
        if not fn in self.depends_cache:
@@ -184,39 +258,46 @@ class Cache:
            self.remove(fn)
            return False

+        mtime = bb.parse.cached_mtime_noerror(fn) 
+
+        # Check file still exists
+        if mtime == 0:
+            bb.msg.debug(2, bb.msg.domain.Cache, "Cache: %s not longer exists" % fn)
+            self.remove(fn)
+            return False
+
        # Check the file's timestamp
-        if bb.parse.cached_mtime(fn) > self.getVar("CACHETIMESTAMP", fn, True):
+        if mtime != self.getVar("CACHETIMESTAMP", fn, True):
            bb.msg.debug(2, bb.msg.domain.Cache, "Cache: %s changed" % fn)
            self.remove(fn)
            return False

        # Check dependencies are still valid
        depends = self.getVar("__depends", fn, True)
-        for f,old_mtime in depends:
-            # Check if file still exists
-            if self.mtime(f) == 0:
-                return False
+        if depends:
+            for f,old_mtime in depends:
+                fmtime = bb.parse.cached_mtime_noerror(f)
+                # Check if file still exists
+                if old_mtime != 0 and fmtime == 0:
+                    self.remove(fn)
+                    return False

-            new_mtime = bb.parse.cached_mtime(f)
-            if (new_mtime > old_mtime):
-                bb.msg.debug(2, bb.msg.domain.Cache, "Cache: %s's dependency %s changed" % (fn, f))
-                self.remove(fn)
-                return False
+                if (fmtime != old_mtime):
+                    bb.msg.debug(2, bb.msg.domain.Cache, "Cache: %s's dependency %s changed" % (fn, f))
+                    self.remove(fn)
+                    return False

-        bb.msg.debug(2, bb.msg.domain.Cache, "Depends Cache: %s is clean" % fn)
+        #bb.msg.debug(2, bb.msg.domain.Cache, "Depends Cache: %s is clean" % fn)
        if not fn in self.clean:
            self.clean[fn] = ""

-        return True
+        # Mark extended class data as clean too
+        multi = self.getVar('__VARIANTS', fn, True)
+        for cls in (multi or "").split():
+            virtualfn = self.realfn2virtual(fn, cls)
+            self.clean[virtualfn] = ""

-    def skip(self, fn):
-        """
-        Mark a fn as skipped
-        Called from the parser
-        """
-        if not fn in self.depends_cache:
-            self.depends_cache[fn] = {}
-        self.depends_cache[fn]["SKIPPED"] = "1"
+        return True

    def remove(self, fn):
        """
@@ -234,16 +315,30 @@ class Cache:
        Save the cache
        Called from the parser when complete (or exiting)
        """
+        import copy

        if not self.has_cache:
            return

+        if self.cacheclean:
+            bb.msg.note(1, bb.msg.domain.Cache, "Cache is clean, not saving.")
+            return
+
        version_data = {}
        version_data['CACHE_VER'] = __cache_version__
        version_data['BITBAKE_VER'] = bb.__version__

+        cache_data = copy.copy(self.depends_cache)
+        for fn in self.depends_cache:
+            if '__BB_DONT_CACHE' in self.depends_cache[fn] and self.depends_cache[fn]['__BB_DONT_CACHE']:
+                bb.msg.debug(2, bb.msg.domain.Cache, "Not caching %s, marked as not cacheable" % fn)
+                del cache_data[fn]
+            elif 'PV' in self.depends_cache[fn] and 'SRCREVINACTION' in self.depends_cache[fn]['PV']:
+                bb.msg.error(bb.msg.domain.Cache, "Not caching %s as it had SRCREVINACTION in PV. Please report this bug" % fn)
+                del cache_data[fn]
+
        p = pickle.Pickler(file(self.cachefile, "wb" ), -1 )
-        p.dump([self.depends_cache, version_data])
+        p.dump([cache_data, version_data])

    def mtime(self, cachefile):
        return bb.parse.cached_mtime_noerror(cachefile)
@@ -256,15 +351,15 @@ class Cache:
        pn       = self.getVar('PN', file_name, True)
        pe       = self.getVar('PE', file_name, True) or "0"
        pv       = self.getVar('PV', file_name, True)
+        if 'SRCREVINACTION' in pv:
+            bb.note("Found SRCREVINACTION in PV (%s) or %s. Please report this bug." % (pv, file_name))
        pr       = self.getVar('PR', file_name, True)
        dp       = int(self.getVar('DEFAULT_PREFERENCE', file_name, True) or "0")
-        provides  = Set([pn] + (self.getVar("PROVIDES", file_name, True) or "").split())
        depends   = bb.utils.explode_deps(self.getVar("DEPENDS", file_name, True) or "")
        packages  = (self.getVar('PACKAGES', file_name, True) or "").split()
        packages_dynamic = (self.getVar('PACKAGES_DYNAMIC', file_name, True) or "").split()
        rprovides = (self.getVar("RPROVIDES", file_name, True) or "").split()

-        cacheData.task_queues[file_name] = self.getVar("_task_graph", file_name, True)
        cacheData.task_deps[file_name] = self.getVar("_task_deps", file_name, True)

        # build PackageName to FileName lookup table
@@ -279,24 +374,31 @@ class Cache:
        cacheData.pkg_pepvpr[file_name] = (pe,pv,pr)
        cacheData.pkg_dp[file_name] = dp

+        provides = [pn]
+        for provide in (self.getVar("PROVIDES", file_name, True) or "").split():
+            if provide not in provides:
+                provides.append(provide)
+
        # Build forward and reverse provider hashes
        # Forward: virtual -> [filenames]
        # Reverse: PN -> [virtuals]
        if pn not in cacheData.pn_provides:
-            cacheData.pn_provides[pn] = Set()
-        cacheData.pn_provides[pn] |= provides
+            cacheData.pn_provides[pn] = []

-        cacheData.fn_provides[file_name] = Set()
+        cacheData.fn_provides[file_name] = provides
        for provide in provides:
            if provide not in cacheData.providers:
                cacheData.providers[provide] = []
            cacheData.providers[provide].append(file_name)
-            cacheData.fn_provides[file_name].add(provide)
+            if not provide in cacheData.pn_provides[pn]:
+                cacheData.pn_provides[pn].append(provide)

-        cacheData.deps[file_name] = Set()
+        cacheData.deps[file_name] = []
        for dep in depends:
-            cacheData.all_depends.add(dep)
-            cacheData.deps[file_name].add(dep)
+            if not dep in cacheData.deps[file_name]:
+                cacheData.deps[file_name].append(dep)
+            if not dep in cacheData.all_depends:
+                cacheData.all_depends.append(dep)

        # Build reverse hash for PACKAGES, so runtime dependencies 
        # can be be resolved (RDEPENDS, RRECOMMENDS etc.)
@@ -318,32 +420,30 @@ class Cache:

        # Build hash of runtime depends and rececommends

-        def add_dep(deplist, deps):
-            for dep in deps:
-                if not dep in deplist:
-                    deplist[dep] = ""
-
        if not file_name in cacheData.rundeps:
            cacheData.rundeps[file_name] = {}
        if not file_name in cacheData.runrecs:
            cacheData.runrecs[file_name] = {}

+        rdepends = self.getVar('RDEPENDS', file_name, True) or ""
+        rrecommends = self.getVar('RRECOMMENDS', file_name, True) or ""
        for package in packages + [pn]:
            if not package in cacheData.rundeps[file_name]:
-                cacheData.rundeps[file_name][package] = {}
+                cacheData.rundeps[file_name][package] = []
            if not package in cacheData.runrecs[file_name]:
-                cacheData.runrecs[file_name][package] = {}
+                cacheData.runrecs[file_name][package] = []

-            add_dep(cacheData.rundeps[file_name][package], bb.utils.explode_deps(self.getVar('RDEPENDS', file_name, True) or ""))
-            add_dep(cacheData.runrecs[file_name][package], bb.utils.explode_deps(self.getVar('RRECOMMENDS', file_name, True) or ""))
-            add_dep(cacheData.rundeps[file_name][package], bb.utils.explode_deps(self.getVar("RDEPENDS_%s" % package, file_name, True) or ""))
-            add_dep(cacheData.runrecs[file_name][package], bb.utils.explode_deps(self.getVar("RRECOMMENDS_%s" % package, file_name, True) or ""))
+            cacheData.rundeps[file_name][package] = rdepends + " " + (self.getVar("RDEPENDS_%s" % package, file_name, True) or "")
+            cacheData.runrecs[file_name][package] = rrecommends + " " + (self.getVar("RRECOMMENDS_%s" % package, file_name, True) or "")

        # Collect files we may need for possible world-dep
        # calculations
        if not self.getVar('BROKEN', file_name, True) and not self.getVar('EXCLUDE_FROM_WORLD', file_name, True):
            cacheData.possible_world.append(file_name)

+        # Touch this to make sure its in the cache
+        self.getVar('__BB_DONT_CACHE', file_name, True)
+        self.getVar('__VARIANTS', file_name, True)

    def load_bbfile( self, bbfile , config):
        """
@@ -358,16 +458,13 @@ class Cache:
        data.setVar('TMPDIR', data.getVar('TMPDIR', config, 1) or "", config)
        bbfile_loc = os.path.abspath(os.path.dirname(bbfile))
        oldpath = os.path.abspath(os.getcwd())
-        if self.mtime(bbfile_loc):
+        if bb.parse.cached_mtime_noerror(bbfile_loc):
            os.chdir(bbfile_loc)
        bb_data = data.init_db(config)
        try:
            bb_data = parse.handle(bbfile, bb_data) # read .bb data
            os.chdir(oldpath)
-            return bb_data, False
-        except bb.parse.SkipPackage:
-            os.chdir(oldpath)
-            return bb_data, True
+            return bb_data
        except:
            os.chdir(oldpath)
            raise
@@ -417,7 +514,7 @@ class CacheData:
        self.pkg_dp = {}
        self.pn_provides = {}
        self.fn_provides = {}
-        self.all_depends = Set()
+        self.all_depends = []
        self.deps = {}
        self.rundeps = {}
        self.runrecs = {}
@@ -431,6 +528,6 @@ class CacheData:
        (set elsewhere)
        """
        self.ignored_dependencies = []
-        self.world_target = Set()
+        self.world_target = set()
        self.bbfile_priority = {}
        self.bbfile_config_priorities = []
--- a/bitbake/lib/bb/command.py
+++ b/bitbake/lib/bb/command.py
@@ -0,0 +1,273 @@
+"""
+BitBake 'Command' module
+
+Provide an interface to interact with the bitbake server through 'commands'
+"""
+
+# Copyright (C) 2006-2007  Richard Purdie
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+"""
+The bitbake server takes 'commands' from its UI/commandline. 
+Commands are either synchronous or asynchronous.
+Async commands return data to the client in the form of events.
+Sync commands must only return data through the function return value
+and must not trigger events, directly or indirectly.
+Commands are queued in a CommandQueue
+"""
+
+import bb.event
+import bb.cooker
+import bb.data
+
+async_cmds = {}
+sync_cmds = {}
+
+class Command:
+    """
+    A queue of asynchronous commands for bitbake
+    """
+    def __init__(self, cooker):
+
+        self.cooker = cooker
+        self.cmds_sync = CommandsSync()
+        self.cmds_async = CommandsAsync()
+
+        # FIXME Add lock for this
+        self.currentAsyncCommand = None
+
+        for attr in CommandsSync.__dict__:
+            command = attr[:].lower()
+            method = getattr(CommandsSync, attr)
+            sync_cmds[command] = (method)
+
+        for attr in CommandsAsync.__dict__:
+            command = attr[:].lower()
+            method = getattr(CommandsAsync, attr)
+            async_cmds[command] = (method)
+
+    def runCommand(self, commandline):
+        try:
+            command = commandline.pop(0)
+            if command in CommandsSync.__dict__:
+                # Can run synchronous commands straight away            
+                return getattr(CommandsSync, command)(self.cmds_sync, self, commandline)
+            if self.currentAsyncCommand is not None:
+                return "Busy (%s in progress)" % self.currentAsyncCommand[0]
+            if command not in CommandsAsync.__dict__:
+                return "No such command"
+            self.currentAsyncCommand = (command, commandline)
+            self.cooker.server.register_idle_function(self.cooker.runCommands, self.cooker)
+            return True
+        except:
+            import traceback
+            return traceback.format_exc()
+
+    def runAsyncCommand(self):
+        try:
+            if self.currentAsyncCommand is not None:
+                (command, options) = self.currentAsyncCommand
+                commandmethod = getattr(CommandsAsync, command)
+                needcache = getattr( commandmethod, "needcache" )
+                if needcache and self.cooker.cookerState != bb.cooker.cookerParsed:
+                    self.cooker.updateCache()
+                    return True
+                else:
+                    commandmethod(self.cmds_async, self, options)
+                    return False
+            else:
+                return False
+        except:
+            import traceback
+            self.finishAsyncCommand(traceback.format_exc())
+            return False
+
+    def finishAsyncCommand(self, error = None):
+        if error:
+            bb.event.fire(CookerCommandFailed(error), self.cooker.configuration.event_data)
+        else:
+            bb.event.fire(CookerCommandCompleted(), self.cooker.configuration.event_data)
+        self.currentAsyncCommand = None
+
+
+class CommandsSync:
+    """
+    A class of synchronous commands
+    These should run quickly so as not to hurt interactive performance.
+    These must not influence any running synchronous command.
+    """
+
+    def stateShutdown(self, command, params):
+        """
+        Trigger cooker 'shutdown' mode
+        """
+        command.cooker.cookerAction = bb.cooker.cookerShutdown
+
+    def stateStop(self, command, params):
+        """
+        Stop the cooker
+        """
+        command.cooker.cookerAction = bb.cooker.cookerStop
+
+    def getCmdLineAction(self, command, params):
+        """
+        Get any command parsed from the commandline
+        """
+        return command.cooker.commandlineAction
+
+    def getVariable(self, command, params):
+        """
+        Read the value of a variable from configuration.data
+        """
+        varname = params[0]
+        expand = True
+        if len(params) > 1:
+            expand = params[1]
+
+        return bb.data.getVar(varname, command.cooker.configuration.data, expand)
+
+    def setVariable(self, command, params):
+        """
+        Set the value of variable in configuration.data
+        """
+        varname = params[0]
+        value = params[1]
+        bb.data.setVar(varname, value, command.cooker.configuration.data)
+
+
+class CommandsAsync:
+    """
+    A class of asynchronous commands
+    These functions communicate via generated events.
+    Any function that requires metadata parsing should be here.
+    """
+
+    def buildFile(self, command, params):
+        """
+        Build a single specified .bb file
+        """
+        bfile = params[0]
+        task = params[1]
+
+        command.cooker.buildFile(bfile, task)
+    buildFile.needcache = False
+
+    def buildTargets(self, command, params):
+        """
+        Build a set of targets
+        """
+        pkgs_to_build = params[0]
+        task = params[1]
+
+        command.cooker.buildTargets(pkgs_to_build, task)
+    buildTargets.needcache = True
+
+    def generateDepTreeEvent(self, command, params):
+        """
+        Generate an event containing the dependency information
+        """
+        pkgs_to_build = params[0]
+        task = params[1]
+
+        command.cooker.generateDepTreeEvent(pkgs_to_build, task)
+        command.finishAsyncCommand()
+    generateDepTreeEvent.needcache = True
+
+    def generateDotGraph(self, command, params):
+        """
+        Dump dependency information to disk as .dot files
+        """
+        pkgs_to_build = params[0]
+        task = params[1]
+
+        command.cooker.generateDotGraphFiles(pkgs_to_build, task)
+        command.finishAsyncCommand()
+    generateDotGraph.needcache = True
+
+    def showVersions(self, command, params):
+        """
+        Show the currently selected versions
+        """
+        command.cooker.showVersions()
+        command.finishAsyncCommand()
+    showVersions.needcache = True
+
+    def showEnvironmentTarget(self, command, params):
+        """
+        Print the environment of a target recipe
+        (needs the cache to work out which recipe to use)
+        """
+        pkg = params[0]
+
+        command.cooker.showEnvironment(None, pkg)
+        command.finishAsyncCommand()
+    showEnvironmentTarget.needcache = True
+
+    def showEnvironment(self, command, params):
+        """
+        Print the standard environment
+        or if specified the environment for a specified recipe
+        """
+        bfile = params[0]
+
+        command.cooker.showEnvironment(bfile)
+        command.finishAsyncCommand()
+    showEnvironment.needcache = False
+
+    def parseFiles(self, command, params):
+        """
+        Parse the .bb files
+        """
+        command.cooker.updateCache()
+        command.finishAsyncCommand()
+    parseFiles.needcache = True
+
+    def compareRevisions(self, command, params):
+        """
+        Parse the .bb files
+        """
+        command.cooker.compareRevisions()
+        command.finishAsyncCommand()
+    compareRevisions.needcache = True
+
+#
+# Events
+#
+class CookerCommandCompleted(bb.event.Event):
+    """
+    Cooker command completed
+    """
+    def  __init__(self):
+        bb.event.Event.__init__(self)
+
+
+class CookerCommandFailed(bb.event.Event):
+    """
+    Cooker command completed
+    """
+    def  __init__(self, error):
+        bb.event.Event.__init__(self)
+        self.error = error
+
+class CookerCommandSetExitCode(bb.event.Event):
+    """
+    Set the exit code for a cooker command
+    """
+    def  __init__(self, exitcode):
+        bb.event.Event.__init__(self)
+        self.exitcode = int(exitcode)
+
+
+
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
--- a/bitbake/lib/bb/daemonize.py
+++ b/bitbake/lib/bb/daemonize.py
@@ -0,0 +1,191 @@
+"""
+Python Deamonizing helper
+
+Configurable daemon behaviors:
+
+   1.) The current working directory set to the "/" directory.
+   2.) The current file creation mode mask set to 0.
+   3.) Close all open files (1024). 
+   4.) Redirect standard I/O streams to "/dev/null".
+
+A failed call to fork() now raises an exception.
+
+References:
+   1) Advanced Programming in the Unix Environment: W. Richard Stevens
+   2) Unix Programming Frequently Asked Questions:
+         http://www.erlenstar.demon.co.uk/unix/faq_toc.html
+
+Modified to allow a function to be daemonized and return for 
+bitbake use by Richard Purdie
+"""
+
+__author__ = "Chad J. Schroeder"
+__copyright__ = "Copyright (C) 2005 Chad J. Schroeder"
+__version__ = "0.2"
+
+# Standard Python modules.
+import os               # Miscellaneous OS interfaces.
+import sys              # System-specific parameters and functions.
+
+# Default daemon parameters.
+# File mode creation mask of the daemon.
+# For BitBake's children, we do want to inherit the parent umask.
+UMASK = None
+
+# Default maximum for the number of available file descriptors.
+MAXFD = 1024
+
+# The standard I/O file descriptors are redirected to /dev/null by default.
+if (hasattr(os, "devnull")):
+   REDIRECT_TO = os.devnull
+else:
+   REDIRECT_TO = "/dev/null"
+
+def createDaemon(function, logfile):
+   """
+   Detach a process from the controlling terminal and run it in the
+   background as a daemon, returning control to the caller.
+   """
+
+   try:
+      # Fork a child process so the parent can exit.  This returns control to
+      # the command-line or shell.  It also guarantees that the child will not
+      # be a process group leader, since the child receives a new process ID
+      # and inherits the parent's process group ID.  This step is required
+      # to insure that the next call to os.setsid is successful.
+      pid = os.fork()
+   except OSError, e:
+      raise Exception, "%s [%d]" % (e.strerror, e.errno)
+
+   if (pid == 0):	# The first child.
+      # To become the session leader of this new session and the process group
+      # leader of the new process group, we call os.setsid().  The process is
+      # also guaranteed not to have a controlling terminal.
+      os.setsid()
+
+      # Is ignoring SIGHUP necessary?
+      #
+      # It's often suggested that the SIGHUP signal should be ignored before
+      # the second fork to avoid premature termination of the process.  The
+      # reason is that when the first child terminates, all processes, e.g.
+      # the second child, in the orphaned group will be sent a SIGHUP.
+      #
+      # "However, as part of the session management system, there are exactly
+      # two cases where SIGHUP is sent on the death of a process:
+      #
+      #   1) When the process that dies is the session leader of a session that
+      #      is attached to a terminal device, SIGHUP is sent to all processes
+      #      in the foreground process group of that terminal device.
+      #   2) When the death of a process causes a process group to become
+      #      orphaned, and one or more processes in the orphaned group are
+      #      stopped, then SIGHUP and SIGCONT are sent to all members of the
+      #      orphaned group." [2]
+      #
+      # The first case can be ignored since the child is guaranteed not to have
+      # a controlling terminal.  The second case isn't so easy to dismiss.
+      # The process group is orphaned when the first child terminates and
+      # POSIX.1 requires that every STOPPED process in an orphaned process
+      # group be sent a SIGHUP signal followed by a SIGCONT signal.  Since the
+      # second child is not STOPPED though, we can safely forego ignoring the
+      # SIGHUP signal.  In any case, there are no ill-effects if it is ignored.
+      #
+      # import signal           # Set handlers for asynchronous events.
+      # signal.signal(signal.SIGHUP, signal.SIG_IGN)
+
+      try:
+         # Fork a second child and exit immediately to prevent zombies.  This
+         # causes the second child process to be orphaned, making the init
+         # process responsible for its cleanup.  And, since the first child is
+         # a session leader without a controlling terminal, it's possible for
+         # it to acquire one by opening a terminal in the future (System V-
+         # based systems).  This second fork guarantees that the child is no
+         # longer a session leader, preventing the daemon from ever acquiring
+         # a controlling terminal.
+         pid = os.fork()	# Fork a second child.
+      except OSError, e:
+         raise Exception, "%s [%d]" % (e.strerror, e.errno)
+
+      if (pid == 0):	# The second child.
+         # We probably don't want the file mode creation mask inherited from
+         # the parent, so we give the child complete control over permissions.
+         if UMASK is not None:
+             os.umask(UMASK)
+      else:
+         # Parent (the first child) of the second child.
+         os._exit(0)
+   else:
+      # exit() or _exit()?
+      # _exit is like exit(), but it doesn't call any functions registered
+      # with atexit (and on_exit) or any registered signal handlers.  It also
+      # closes any open file descriptors.  Using exit() may cause all stdio
+      # streams to be flushed twice and any temporary files may be unexpectedly
+      # removed.  It's therefore recommended that child branches of a fork()
+      # and the parent branch(es) of a daemon use _exit().
+      return
+
+   # Close all open file descriptors.  This prevents the child from keeping
+   # open any file descriptors inherited from the parent.  There is a variety
+   # of methods to accomplish this task.  Three are listed below.
+   #
+   # Try the system configuration variable, SC_OPEN_MAX, to obtain the maximum
+   # number of open file descriptors to close.  If it doesn't exists, use
+   # the default value (configurable).
+   #
+   # try:
+   #    maxfd = os.sysconf("SC_OPEN_MAX")
+   # except (AttributeError, ValueError):
+   #    maxfd = MAXFD
+   #
+   # OR
+   #
+   # if (os.sysconf_names.has_key("SC_OPEN_MAX")):
+   #    maxfd = os.sysconf("SC_OPEN_MAX")
+   # else:
+   #    maxfd = MAXFD
+   #
+   # OR
+   #
+   # Use the getrlimit method to retrieve the maximum file descriptor number
+   # that can be opened by this process.  If there is not limit on the
+   # resource, use the default value.
+   #
+   import resource		# Resource usage information.
+   maxfd = resource.getrlimit(resource.RLIMIT_NOFILE)[1]
+   if (maxfd == resource.RLIM_INFINITY):
+      maxfd = MAXFD
+  
+   # Iterate through and close all file descriptors.
+#   for fd in range(0, maxfd):
+#      try:
+#         os.close(fd)
+#      except OSError:	# ERROR, fd wasn't open to begin with (ignored)
+#         pass
+
+   # Redirect the standard I/O file descriptors to the specified file.  Since
+   # the daemon has no controlling terminal, most daemons redirect stdin,
+   # stdout, and stderr to /dev/null.  This is done to prevent side-effects
+   # from reads and writes to the standard I/O file descriptors.
+
+   # This call to open is guaranteed to return the lowest file descriptor,
+   # which will be 0 (stdin), since it was closed above.
+#   os.open(REDIRECT_TO, os.O_RDWR)	# standard input (0)
+
+   # Duplicate standard input to standard output and standard error.
+#   os.dup2(0, 1)			# standard output (1)
+#   os.dup2(0, 2)			# standard error (2)
+
+
+   si = file('/dev/null', 'r')
+   so = file(logfile, 'w')
+   se = so
+
+
+   # Replace those fds with our own
+   os.dup2(si.fileno(), sys.stdin.fileno())
+   os.dup2(so.fileno(), sys.stdout.fileno())
+   os.dup2(se.fileno(), sys.stderr.fileno())
+
+   function()
+
+   os._exit(0)
+
--- a/bitbake/lib/bb/data.py
+++ b/bitbake/lib/bb/data.py
@@ -37,7 +37,7 @@ the speed is more critical here.
 #
 #Based on functions from the base bb module, Copyright 2003 Holger Schurig

-import sys, os, re, time, types
+import sys, os, re, types
 if sys.argv[0][-5:] == "pydoc":
    path = os.path.dirname(os.path.dirname(sys.argv[1]))
 else:
@@ -47,6 +47,9 @@ sys.path.insert(0,path)
 from bb import data_smart
 import bb

+class VarExpandError(Exception):
+    pass
+
 _dict_type = data_smart.DataSmart

 def init():
@@ -324,21 +327,14 @@ def expandData(alterdata, readdata = None):
        if val != expanded:
            setVar(key, expanded, alterdata)

-import os
-
 def inheritFromOS(d):
    """Inherit variables from the environment."""
-#   fakeroot needs to be able to set these
-    non_inherit_vars = [ "LD_LIBRARY_PATH", "LD_PRELOAD" ]
    for s in os.environ.keys():
-        if not s in non_inherit_vars:
-            try:
-                setVar(s, os.environ[s], d)
-                setVarFlag(s, 'matchesenv', '1', d)
-            except TypeError:
-                pass
-
-import sys
+        try:
+            setVar(s, os.environ[s], d)
+            setVarFlag(s, "export", True, d)
+        except TypeError:
+            pass

 def emit_var(var, o=sys.__stdout__, d = init(), all=False):
    """Emit a variable to be sourced by a shell."""
@@ -379,9 +375,6 @@ def emit_var(var, o=sys.__stdout__, d = init(), all=False):
        o.write('unset %s\n' % varExpanded)
        return 1

-    if getVarFlag(var, 'matchesenv', d):
-        return 0
-
    val.rstrip()
    if not val:
        return 0
@@ -563,7 +556,9 @@ def inherits_class(klass, d):
 def _test():
    """Start a doctest run on this module"""
    import doctest
+    import bb
    from bb import data
+    bb.msg.set_debug_level(0)
    doctest.testmod(data)

 if __name__ == "__main__":
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -32,7 +32,6 @@ import copy, os, re, sys, time, types
 import bb
 from bb   import utils, methodpool
 from COW  import COWDictBase
-from sets import Set
 from new  import classobj


@@ -40,6 +39,11 @@ __setvar_keyword__ = ["_append","_prepend"]
 __setvar_regexp__ = re.compile('(?P<base>.*?)(?P<keyword>_append|_prepend)(_(?P<add>.*))?')
 __expand_var_regexp__ = re.compile(r"\${[^{}]+}")
 __expand_python_regexp__ = re.compile(r"\${@.+?}")
+_expand_globals = {
+    "os": os,
+    "bb": bb,
+    "time": time,
+}


 class DataSmart:
@@ -51,6 +55,7 @@ class DataSmart:
        self._seen_overrides = seen

        self.expand_cache = {}
+        self.expand_locals = {"d": self}

    def expand(self,s, varname):
        def var_sub(match):
@@ -67,8 +72,7 @@ class DataSmart:
        def python_sub(match):
            import bb
            code = match.group()[3:-1]
-            locals()['d'] = self
-            s = eval(code)
+            s = eval(code, _expand_globals, self.expand_locals)
            if type(s) == types.IntType: s = str(s)
            return s

@@ -142,22 +146,19 @@ class DataSmart:
            try:
                self._special_values[keyword].add( base )
            except:
-                self._special_values[keyword] = Set()
+                self._special_values[keyword] = set()
                self._special_values[keyword].add( base )

            return

        if not var in self.dict:
            self._makeShadowCopy(var)
-        if self.getVarFlag(var, 'matchesenv'):
-            self.delVarFlag(var, 'matchesenv')
-            self.setVarFlag(var, 'export', 1)

        # more cookies for the cookie monster
        if '_' in var:
            override = var[var.rfind('_')+1:]
            if not self._seen_overrides.has_key(override):
-                self._seen_overrides[override] = Set()
+                self._seen_overrides[override] = set()
            self._seen_overrides[override].add( var )

        # setting var
@@ -175,14 +176,15 @@ class DataSmart:
        Rename the variable key to newkey 
        """
        val = self.getVar(key, 0)
-        if val is None:
-            return
-
-        self.setVar(newkey, val)
+        if val is not None:
+            self.setVar(newkey, val)

        for i in ('_append', '_prepend'):
+            src = self.getVarFlag(key, i)
+            if src is None:
+                continue
+
            dest = self.getVarFlag(newkey, i) or []
-            src = self.getVarFlag(key, i) or []
            dest.extend(src)
            self.setVarFlag(newkey, i, dest)
            
@@ -222,7 +224,7 @@ class DataSmart:
        if not var in self.dict:
            self._makeShadowCopy(var)

-        for i in flags.keys():
+        for i in flags:
            if i == "content":
                continue
            self.dict[var][i] = flags[i]
@@ -232,10 +234,10 @@ class DataSmart:
        flags = {}

        if local_var:
-            for i in self.dict[var].keys():
+            for i in local_var:
                if i == "content":
                    continue
-                flags[i] = self.dict[var][i]
+                flags[i] = local_var[i]

        if len(flags) == 0:
            return None
--- a/bitbake/lib/bb/event.py
+++ b/bitbake/lib/bb/event.py
@@ -22,23 +22,20 @@ BitBake build tools.
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

-import os, re
+import os, re, sys
 import bb.utils
+import pickle
+
+# This is the pid for which we should generate the event. This is set when
+# the runqueue forks off.
+worker_pid = 0
+worker_pipe = None

 class Event:
    """Base class for events"""
-    type = "Event"

-    def __init__(self, d):
-        self._data = d
-
-    def getData(self):
-        return self._data
-
-    def setData(self, data):
-        self._data = data
-
-    data = property(getData, setData, None, "data property")
+    def __init__(self):
+        self.pid = worker_pid

 NotHandled = 0
 Handled = 1
@@ -47,75 +44,95 @@ Registered        = 10
 AlreadyRegistered = 14

 # Internal
-_handlers = []
-_handlers_dict = {}
+_handlers = {}
+_ui_handlers = {}
+_ui_handler_seq = 0

-def tmpHandler(event):
-    """Default handler for code events"""
-    return NotHandled
-
-def defaultTmpHandler():
-    tmp = "def tmpHandler(e):\n\t\"\"\"heh\"\"\"\n\treturn NotHandled"
-    comp = bb.utils.better_compile(tmp, "tmpHandler(e)", "bb.event.defaultTmpHandler")
-    return comp
-
-def fire(event):
-    """Fire off an Event"""
-    for h in _handlers:
+def fire_class_handlers(event, d):
+    for handler in _handlers:
+        h = _handlers[handler]
+        event.data = d
        if type(h).__name__ == "code":
            exec(h)
-            if tmpHandler(event) == Handled:
-                return Handled
+            tmpHandler(event)
        else:
-            if h(event) == Handled:
-                return Handled
-    return NotHandled
+            h(event)
+        del event.data
+
+def fire_ui_handlers(event, d):
+    errors = []
+    for h in _ui_handlers:
+        #print "Sending event %s" % event
+        try:
+             # We use pickle here since it better handles object instances
+             # which xmlrpc's marshaller does not. Events *must* be serializable
+             # by pickle.
+            _ui_handlers[h].event.send((pickle.dumps(event)))
+        except:
+            errors.append(h)
+    for h in errors:
+        del _ui_handlers[h]
+
+def fire(event, d):
+    """Fire off an Event"""
+
+    # We can fire class handlers in the worker process context and this is 
+    # desired so they get the task based datastore.
+    # UI handlers need to be fired in the server context so we defer this. They 
+    # don't have a datastore so the datastore context isn't a problem.
+
+    fire_class_handlers(event, d)
+    if worker_pid != 0:
+        worker_fire(event, d)
+    else:
+        fire_ui_handlers(event, d)
+
+def worker_fire(event, d):
+    data = "<event>" + pickle.dumps(event) + "</event>"
+    try:
+        if os.write(worker_pipe, data) != len (data):
+            print "Error sending event to server (short write)"
+    except OSError:
+        sys.exit(1)
+
+def fire_from_worker(event, d):
+    if not event.startswith("<event>") or not event.endswith("</event>"):
+        print "Error, not an event"
+        return
+    event = pickle.loads(event[7:-8])
+    fire_ui_handlers(event, d)

 def register(name, handler):
    """Register an Event handler"""

    # already registered
-    if name in _handlers_dict:
+    if name in _handlers:
        return AlreadyRegistered

    if handler is not None:
-#       handle string containing python code
+        # handle string containing python code
        if type(handler).__name__ == "str":
-            _registerCode(handler)
+            tmp = "def tmpHandler(e):\n%s" % handler
+            comp = bb.utils.better_compile(tmp, "tmpHandler(e)", "bb.event._registerCode")
+            _handlers[name] = comp
        else:
-            _handlers.append(handler)
+            _handlers[name] = handler

-        _handlers_dict[name] = 1
        return Registered

-def _registerCode(handlerStr):
-    """Register a 'code' Event.
-       Deprecated interface; call register instead.
-
-       Expects to be passed python code as a string, which will
-       be passed in turn to compile() and then exec().  Note that
-       the code will be within a function, so should have had
-       appropriate tabbing put in place."""
-    tmp = "def tmpHandler(e):\n%s" % handlerStr
-    comp = bb.utils.better_compile(tmp, "tmpHandler(e)", "bb.event._registerCode")
-#   prevent duplicate registration
-    _handlers.append(comp)
-
 def remove(name, handler):
    """Remove an Event handler"""
+    _handlers.pop(name)

-    _handlers_dict.pop(name)
-    if type(handler).__name__ == "str":
-        return _removeCode(handler)
-    else:
-        _handlers.remove(handler)
+def register_UIHhandler(handler):
+    bb.event._ui_handler_seq = bb.event._ui_handler_seq + 1
+    _ui_handlers[_ui_handler_seq] = handler
+    return _ui_handler_seq

-def _removeCode(handlerStr):
-    """Remove a 'code' Event handler
-       Deprecated interface; call remove instead."""
-    tmp = "def tmpHandler(e):\n%s" % handlerStr
-    comp = bb.utils.better_compile(tmp, "tmpHandler(e)", "bb.event._removeCode")
-    _handlers.remove(comp)
+def unregister_UIHhandler(handlerNum):
+    if handlerNum in _ui_handlers:
+        del _ui_handlers[handlerNum]
+    return

 def getName(e):
    """Returns the name of a class or class instance"""
@@ -127,29 +144,37 @@ def getName(e):
 class ConfigParsed(Event):
    """Configuration Parsing Complete"""

-class PkgBase(Event):
-    """Base class for package events"""
+class RecipeParsed(Event):
+    """ Recipe Parsing Complete """

-    def __init__(self, t, d):
-        self._pkg = t
-        Event.__init__(self, d)
+    def __init__(self, fn):
+        self.fn = fn
+        Event.__init__(self)

-    def getPkg(self):
-        return self._pkg
+class StampUpdate(Event):
+    """Trigger for any adjustment of the stamp files to happen"""

-    def setPkg(self, pkg):
-        self._pkg = pkg
+    def __init__(self, targets, stampfns):
+        self._targets = targets
+        self._stampfns = stampfns
+        Event.__init__(self)

-    pkg = property(getPkg, setPkg, None, "pkg property")
+    def getStampPrefix(self):
+        return self._stampfns

+    def getTargets(self):
+        return self._targets
+
+    stampPrefix = property(getStampPrefix)
+    targets = property(getTargets)

 class BuildBase(Event):
    """Base class for bbmake run events"""

-    def __init__(self, n, p, c, failures = 0):
+    def __init__(self, n, p, failures = 0):
        self._name = n
        self._pkgs = p
-        Event.__init__(self, c)
+        Event.__init__(self)
        self._failures = failures

    def getPkgs(self):
@@ -181,32 +206,7 @@ class BuildBase(Event):
    cfg = property(getCfg, setCfg, None, "cfg property")


-class DepBase(PkgBase):
-    """Base class for dependency events"""

-    def __init__(self, t, data, d):
-        self._dep = d
-        PkgBase.__init__(self, t, data)
-
-    def getDep(self):
-        return self._dep
-
-    def setDep(self, dep):
-        self._dep = dep
-
-    dep = property(getDep, setDep, None, "dep property")
-
-
-class PkgStarted(PkgBase):
-    """Package build started"""
-
-
-class PkgFailed(PkgBase):
-    """Package build failed"""
-
-
-class PkgSucceeded(PkgBase):
-    """Package build completed"""


 class BuildStarted(BuildBase):
@@ -217,18 +217,13 @@ class BuildCompleted(BuildBase):
    """bbmake build run completed"""


-class UnsatisfiedDep(DepBase):
-    """Unsatisfied Dependency"""


-class RecursiveDep(DepBase):
-    """Recursive Dependency"""
-
 class NoProvider(Event):
    """No Provider for an Event"""

-    def __init__(self, item, data,runtime=False):
-        Event.__init__(self, data)
+    def __init__(self, item, runtime=False):
+        Event.__init__(self)
        self._item = item
        self._runtime = runtime

@@ -241,8 +236,8 @@ class NoProvider(Event):
 class MultipleProviders(Event):
    """Multiple Providers"""

-    def  __init__(self, item, candidates, data, runtime = False):
-        Event.__init__(self, data)
+    def  __init__(self, item, candidates, runtime = False):
+        Event.__init__(self)
        self._item = item
        self._candidates = candidates
        self._is_runtime = runtime
@@ -264,3 +259,29 @@ class MultipleProviders(Event):
        Get the possible Candidates for a PROVIDER.
        """
        return self._candidates
+
+class ParseProgress(Event):
+    """
+    Parsing Progress Event
+    """
+
+    def __init__(self, cached, parsed, skipped, masked, virtuals, errors, total):
+        Event.__init__(self)
+        self.cached = cached
+        self.parsed = parsed
+        self.skipped = skipped
+        self.virtuals = virtuals
+        self.masked = masked
+        self.errors = errors
+        self.sofar = cached + parsed
+        self.total = total
+
+class DepTreeGenerated(Event):
+    """
+    Event when a dependency tree has been generated
+    """
+
+    def __init__(self, depgraph):
+        Event.__init__(self)
+        self._depgraph = depgraph
+
--- a/bitbake/lib/bb/fetch/init.py
+++ b/bitbake/lib/bb/fetch/init.py
@@ -24,15 +24,13 @@ BitBake build tools.
 #
 # Based on functions from the base bb module, Copyright 2003 Holger Schurig

-import os, re, fcntl
+import os, re
 import bb
 from   bb import data
 from   bb import persist_data

-try:
-    import cPickle as pickle
-except ImportError:
-    import pickle
+class MalformedUrl(Exception):
+    """Exception raised when encountering an invalid url"""

 class FetchError(Exception):
    """Exception raised when a download fails"""
@@ -49,6 +47,106 @@ class ParameterError(Exception):
 class MD5SumError(Exception):
    """Exception raised when a MD5SUM of a file does not match the expected one"""

+class InvalidSRCREV(Exception):
+    """Exception raised when an invalid SRCREV is encountered"""
+
+def decodeurl(url):
+    """Decodes an URL into the tokens (scheme, network location, path,
+    user, password, parameters).
+
+    >>> decodeurl("http://www.google.com/index.html")
+    ('http', 'www.google.com', '/index.html', '', '', {})
+
+    >>> decodeurl("file://gas/COPYING")
+    ('file', '', 'gas/COPYING', '', '', {})
+
+    CVS url with username, host and cvsroot. The cvs module to check out is in the
+    parameters:
+
+    >>> decodeurl("cvs://anoncvs@cvs.handhelds.org/cvs;module=familiar/dist/ipkg")
+    ('cvs', 'cvs.handhelds.org', '/cvs', 'anoncvs', '', {'module': 'familiar/dist/ipkg'})
+
+    Dito, but this time the username has a password part. And we also request a special tag
+    to check out.
+
+    >>> decodeurl("cvs://anoncvs:anonymous@cvs.handhelds.org/cvs;module=familiar/dist/ipkg;tag=V0-99-81")
+    ('cvs', 'cvs.handhelds.org', '/cvs', 'anoncvs', 'anonymous', {'tag': 'V0-99-81', 'module': 'familiar/dist/ipkg'})
+    """
+
+    m = re.compile('(?P<type>[^:]*)://((?P<user>.+)@)?(?P<location>[^;]+)(;(?P<parm>.*))?').match(url)
+    if not m:
+        raise MalformedUrl(url)
+
+    type = m.group('type')
+    location = m.group('location')
+    if not location:
+        raise MalformedUrl(url)
+    user = m.group('user')
+    parm = m.group('parm')
+
+    locidx = location.find('/')
+    if locidx != -1 and type.lower() != 'file':
+        host = location[:locidx]
+        path = location[locidx:]
+    else:
+        host = ""
+        path = location
+    if user:
+        m = re.compile('(?P<user>[^:]+)(:?(?P<pswd>.*))').match(user)
+        if m:
+            user = m.group('user')
+            pswd = m.group('pswd')
+    else:
+        user = ''
+        pswd = ''
+
+    p = {}
+    if parm:
+        for s in parm.split(';'):
+            s1,s2 = s.split('=')
+            p[s1] = s2
+
+    return (type, host, path, user, pswd, p)
+
+def encodeurl(decoded):
+    """Encodes a URL from tokens (scheme, network location, path,
+    user, password, parameters).
+
+    >>> encodeurl(['http', 'www.google.com', '/index.html', '', '', {}])
+    'http://www.google.com/index.html'
+
+    CVS with username, host and cvsroot. The cvs module to check out is in the
+    parameters:
+
+    >>> encodeurl(['cvs', 'cvs.handhelds.org', '/cvs', 'anoncvs', '', {'module': 'familiar/dist/ipkg'}])
+    'cvs://anoncvs@cvs.handhelds.org/cvs;module=familiar/dist/ipkg'
+
+    Dito, but this time the username has a password part. And we also request a special tag
+    to check out.
+
+    >>> encodeurl(['cvs', 'cvs.handhelds.org', '/cvs', 'anoncvs', 'anonymous', {'tag': 'V0-99-81', 'module': 'familiar/dist/ipkg'}])
+    'cvs://anoncvs:anonymous@cvs.handhelds.org/cvs;tag=V0-99-81;module=familiar/dist/ipkg'
+    """
+
+    (type, host, path, user, pswd, p) = decoded
+
+    if not type or not path:
+        bb.msg.fatal(bb.msg.domain.Fetcher, "invalid or missing parameters for url encoding")
+    url = '%s://' % type
+    if user:
+        url += "%s" % user
+        if pswd:
+            url += ":%s" % pswd
+        url += "@"
+    if host:
+        url += "%s" % host
+    url += "%s" % path
+    if p:
+        for parm in p:
+            url += ";%s=%s" % (parm, p[parm])
+
+    return url
+
 def uri_replace(uri, uri_find, uri_replace, d):
 #   bb.msg.note(1, bb.msg.domain.Fetcher, "uri_replace: operating on %s" % uri)
    if not uri or not uri_find or not uri_replace:
@@ -62,7 +160,6 @@ def uri_replace(uri, uri_find, uri_replace, d):
        result_decoded[loc] = uri_decoded[loc]
        import types
        if type(i) == types.StringType:
-            import re
            if (re.match(i, uri_decoded[loc])):
                result_decoded[loc] = re.sub(i, uri_replace_decoded[loc], uri_decoded[loc])
                if uri_find_decoded.index(i) == 2:
@@ -75,12 +172,13 @@ def uri_replace(uri, uri_find, uri_replace, d):
 #               bb.msg.note(1, bb.msg.domain.Fetcher, "uri_replace: no match")
                return uri
 #           else:
-#               for j in i.keys():
+#               for j in i:
 #                   FIXME: apply replacements against options
    return bb.encodeurl(result_decoded)

 methods = []
 urldata_cache = {}
+saved_headrevs = {}

 def fetcher_init(d):
    """
@@ -94,13 +192,42 @@ def fetcher_init(d):
        bb.msg.debug(1, bb.msg.domain.Fetcher, "Keeping SRCREV cache due to cache policy of: %s" % srcrev_policy)
    elif srcrev_policy == "clear":
        bb.msg.debug(1, bb.msg.domain.Fetcher, "Clearing SRCREV cache due to cache policy of: %s" % srcrev_policy)
+        try:
+            bb.fetch.saved_headrevs = pd.getKeyValues("BB_URI_HEADREVS")
+        except:
+            pass
        pd.delDomain("BB_URI_HEADREVS")
    else:
        bb.msg.fatal(bb.msg.domain.Fetcher, "Invalid SRCREV cache policy of: %s" % srcrev_policy)
+
+    for m in methods:
+        if hasattr(m, "init"):
+            m.init(d)
+
    # Make sure our domains exist
    pd.addDomain("BB_URI_HEADREVS")
    pd.addDomain("BB_URI_LOCALCOUNT")

+def fetcher_compare_revisons(d):
+    """
+    Compare the revisions in the persistant cache with current values and
+    return true/false on whether they've changed.
+    """
+
+    pd = persist_data.PersistData(d)
+    data = pd.getKeyValues("BB_URI_HEADREVS")
+    data2 = bb.fetch.saved_headrevs
+
+    changed = False
+    for key in data:
+        if key not in data2 or data2[key] != data[key]:
+            bb.msg.debug(1, bb.msg.domain.Fetcher, "%s changed" % key)
+            changed = True
+            return True
+        else:
+            bb.msg.debug(2, bb.msg.domain.Fetcher, "%s did not change" % key)
+    return False
+
 # Function call order is usually:
 #   1. init
 #   2. go
@@ -125,34 +252,87 @@ def init(urls, d, setup = True):
    urldata_cache[fn] = urldata
    return urldata

-def go(d):
+def go(d, urls = None):
    """
    Fetch all urls
    init must have previously been called
    """
+    if not urls:
+        urls = d.getVar("SRC_URI", 1).split()
+    urldata = init(urls, d, True)
+
+    for u in urls:
+        ud = urldata[u]
+        m = ud.method
+        if ud.localfile:
+            if not m.forcefetch(u, ud, d) and os.path.exists(ud.md5):
+                # File already present along with md5 stamp file
+                # Touch md5 file to show activity
+                try:
+                    os.utime(ud.md5, None)
+                except:
+                    # Errors aren't fatal here
+                    pass
+                continue
+            lf = bb.utils.lockfile(ud.lockfile)
+            if not m.forcefetch(u, ud, d) and os.path.exists(ud.md5):
+                # If someone else fetched this before we got the lock, 
+                # notice and don't try again
+                try:
+                    os.utime(ud.md5, None)
+                except:
+                    # Errors aren't fatal here
+                    pass
+                bb.utils.unlockfile(lf)
+                continue
+
+        # First try fetching uri, u, from PREMIRRORS
+        mirrors = [ i.split() for i in (bb.data.getVar('PREMIRRORS', d, 1) or "").split('\n') if i ]
+        localpath = try_mirrors(d, u, mirrors)
+        if not localpath:
+            # Next try fetching from the original uri, u
+            try:
+                m.go(u, ud, d)
+                localpath = ud.localpath
+            except:
+                # Finally, try fetching uri, u, from MIRRORS
+                mirrors = [ i.split() for i in (bb.data.getVar('MIRRORS', d, 1) or "").split('\n') if i ]
+                localpath = try_mirrors (d, u, mirrors)
+
+        if localpath:
+            ud.localpath = localpath
+
+        if ud.localfile:
+            if not m.forcefetch(u, ud, d):
+                Fetch.write_md5sum(u, ud, d)
+            bb.utils.unlockfile(lf)
+
+
+def checkstatus(d):
+    """
+    Check all urls exist upstream
+    init must have previously been called
+    """
    urldata = init([], d, True)

    for u in urldata:
        ud = urldata[u]
        m = ud.method
-        if ud.localfile:
-            if not m.forcefetch(u, ud, d) and os.path.exists(ud.md5):
-                # File already present along with md5 stamp file
-                # Touch md5 file to show activity
-                os.utime(ud.md5, None)
-                continue
-            lf = bb.utils.lockfile(ud.lockfile)
-            if not m.forcefetch(u, ud, d) and os.path.exists(ud.md5):
-                # If someone else fetched this before we got the lock, 
-                # notice and don't try again
-                os.utime(ud.md5, None)
-                bb.utils.unlockfile(lf)
-                continue
-        m.go(u, ud, d)
-        if ud.localfile:
-            if not m.forcefetch(u, ud, d):
-                Fetch.write_md5sum(u, ud, d)
-            bb.utils.unlockfile(lf)
+        bb.msg.note(1, bb.msg.domain.Fetcher, "Testing URL %s" % u)
+        # First try checking uri, u, from PREMIRRORS
+        mirrors = [ i.split() for i in (bb.data.getVar('PREMIRRORS', d, 1) or "").split('\n') if i ]
+        ret = try_mirrors(d, u, mirrors, True)
+        if not ret:
+            # Next try checking from the original uri, u
+            try:
+                ret = m.checkstatus(u, ud, d)
+            except:
+                # Finally, try checking uri, u, from MIRRORS
+                mirrors = [ i.split() for i in (bb.data.getVar('MIRRORS', d, 1) or "").split('\n') if i ]
+                ret = try_mirrors (d, u, mirrors, True)
+
+        if not ret:
+            bb.msg.error(bb.msg.domain.Fetcher, "URL %s doesn't work" % u)

 def localpaths(d):
    """
@@ -205,6 +385,8 @@ def get_srcrev(d):
        bb.msg.error(bb.msg.domain.Fetcher, "SRCREV was used yet no valid SCM was found in SRC_URI")
        raise ParameterError

+    bb.data.setVar('__BB_DONT_CACHE','1', d)
+
    if len(scms) == 1:
        return urldata[scms[0]].method.sortable_revision(scms[0], urldata[scms[0]], d)

@@ -240,13 +422,22 @@ def runfetchcmd(cmd, d, quiet = False):
    Raise an error if interrupted or cmd fails
    Optionally echo command output to stdout
    """
-    bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % cmd)

    # Need to export PATH as binary could be in metadata paths
    # rather than host provided
-    pathcmd = 'export PATH=%s; %s' % (data.expand('${PATH}', d), cmd)
+    # Also include some other variables.
+    # FIXME: Should really include all export varaiables?
+    exportvars = ['PATH', 'GIT_PROXY_COMMAND', 'GIT_PROXY_HOST', 'GIT_PROXY_PORT', 'GIT_CONFIG', 'http_proxy', 'ftp_proxy', 'SSH_AUTH_SOCK', 'SSH_AGENT_PID', 'HOME']

-    stdout_handle = os.popen(pathcmd, "r")
+    for var in exportvars:
+        val = data.getVar(var, d, True)
+        if val:
+            cmd = 'export ' + var + '=%s; %s' % (val, cmd)
+
+    bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % cmd)
+
+    # redirect stderr to stdout
+    stdout_handle = os.popen(cmd + " 2>&1", "r")
    output = ""

    while 1:
@@ -262,12 +453,54 @@ def runfetchcmd(cmd, d, quiet = False):
    exitstatus = status & 0xff

    if signal:
-        raise FetchError("Fetch command %s failed with signal %s, output:\n%s" % (pathcmd, signal, output))
+        raise FetchError("Fetch command %s failed with signal %s, output:\n%s" % (cmd, signal, output))
    elif status != 0:
-        raise FetchError("Fetch command %s failed with exit code %s, output:\n%s" % (pathcmd, status, output))
+        raise FetchError("Fetch command %s failed with exit code %s, output:\n%s" % (cmd, status, output))

    return output

+def try_mirrors(d, uri, mirrors, check = False):
+    """
+    Try to use a mirrored version of the sources.
+    This method will be automatically called before the fetchers go.
+
+    d Is a bb.data instance
+    uri is the original uri we're trying to download
+    mirrors is the list of mirrors we're going to try
+    """
+    fpath = os.path.join(data.getVar("DL_DIR", d, 1), os.path.basename(uri))
+    if not check and os.access(fpath, os.R_OK):
+        bb.msg.debug(1, bb.msg.domain.Fetcher, "%s already exists, skipping checkout." % fpath)
+        return fpath
+
+    ld = d.createCopy()
+    for (find, replace) in mirrors:
+        newuri = uri_replace(uri, find, replace, ld)
+        if newuri != uri:
+            try:
+                ud = FetchData(newuri, ld)
+            except bb.fetch.NoMethodError:
+                bb.msg.debug(1, bb.msg.domain.Fetcher, "No method for %s" % uri)
+                continue
+
+            ud.setup_localpath(ld)
+
+            try:
+                if check:
+                    ud.method.checkstatus(newuri, ud, ld)
+                else:
+                    ud.method.go(newuri, ud, ld)
+                return ud.localpath
+            except (bb.fetch.MissingParameterError,
+                    bb.fetch.FetchError,
+                    bb.fetch.MD5SumError):
+                import sys
+                (type, value, traceback) = sys.exc_info()
+                bb.msg.debug(2, bb.msg.domain.Fetcher, "Mirror fetch failure: %s" % value)
+                continue
+    return None
+
+
 class FetchData(object):
    """
    A class which represents the fetcher state for a given URI.
@@ -277,6 +510,10 @@ class FetchData(object):
        (self.type, self.host, self.path, self.user, self.pswd, self.parm) = bb.decodeurl(data.expand(url, d))
        self.date = Fetch.getSRCDate(self, d)
        self.url = url
+        if not self.user and "user" in self.parm:
+            self.user = self.parm["user"]
+        if not self.pswd and "pswd" in self.parm:
+            self.pswd = self.parm["pswd"]
        self.setup = False
        for m in methods:
            if m.supports(url, self, d):
@@ -290,14 +527,33 @@ class FetchData(object):
            # if user sets localpath for file, use it instead.
            self.localpath = self.parm["localpath"]
        else:
-            bb.fetch.srcrev_internal_call = True
-            self.localpath = self.method.localpath(self.url, self, d)
-            bb.fetch.srcrev_internal_call = False
-            # We have to clear data's internal caches since the cached value of SRCREV is now wrong.
-            # Horrible...
-            bb.data.delVar("ISHOULDNEVEREXIST", d)
-        self.md5 = self.localpath + '.md5'
-        self.lockfile = self.localpath + '.lock'
+            premirrors = bb.data.getVar('PREMIRRORS', d, True)
+            local = ""
+            if premirrors and self.url:
+                aurl = self.url.split(";")[0]
+                mirrors = [ i.split() for i in (premirrors or "").split('\n') if i ]
+                for (find, replace) in mirrors:
+                    if replace.startswith("file://"):
+                        path = aurl.split("://")[1]
+                        path = path.split(";")[0]
+                        local = replace.split("://")[1] + os.path.basename(path)
+                        if local == aurl or not os.path.exists(local) or os.path.isdir(local):
+                            local = ""
+                self.localpath = local
+            if not local:
+                try:
+                    bb.fetch.srcrev_internal_call = True
+                    self.localpath = self.method.localpath(self.url, self, d)
+                finally:
+                    bb.fetch.srcrev_internal_call = False
+                # We have to clear data's internal caches since the cached value of SRCREV is now wrong.
+                # Horrible...
+                bb.data.delVar("ISHOULDNEVEREXIST", d)
+
+        # Note: These files should always be in DL_DIR whereas localpath may not be.
+        basepath = bb.data.expand("${DL_DIR}/%s" % os.path.basename(self.localpath), d)
+        self.md5 = basepath + '.md5'
+        self.lockfile = basepath + '.lock'


 class Fetch(object):
@@ -347,6 +603,14 @@ class Fetch(object):
        """
        raise NoMethodError("Missing implementation for url")

+    def checkstatus(self, url, urldata, d):
+        """
+        Check the status of a URL
+        Assumes localpath was called first
+        """
+        bb.msg.note(1, bb.msg.domain.Fetcher, "URL %s could not be checked for status since no method exists." % url)
+        return True
+
    def getSRCDate(urldata, d):
        """
        Return the SRC Date for the component
@@ -384,6 +648,8 @@ class Fetch(object):
            rev = data.getVar("SRCREV_pn-" + pn + "_" + ud.parm['name'], d, 1)
        if not rev:
            rev = data.getVar("SRCREV", d, 1)
+        if rev == "INVALID":
+            raise InvalidSRCREV("Please set SRCREV to a valid value")
        if not rev:
            return False
        if rev is "SRCREVINACTION":
@@ -392,37 +658,22 @@ class Fetch(object):

    srcrev_internal_helper = staticmethod(srcrev_internal_helper)

-    def try_mirror(d, tarfn):
+    def localcount_internal_helper(ud, d):
        """
-        Try to use a mirrored version of the sources. We do this
-        to avoid massive loads on foreign cvs and svn servers.
-        This method will be used by the different fetcher
-        implementations.
-
-        d Is a bb.data instance
-        tarfn is the name of the tarball
+        Return:
+            a) a locked localcount if specified
+            b) None otherwise
        """
-        tarpath = os.path.join(data.getVar("DL_DIR", d, 1), tarfn)
-        if os.access(tarpath, os.R_OK):
-            bb.msg.debug(1, bb.msg.domain.Fetcher, "%s already exists, skipping checkout." % tarfn)
-            return True

-        pn = data.getVar('PN', d, True)
-        src_tarball_stash = None
-        if pn:
-            src_tarball_stash = (data.getVar('SRC_TARBALL_STASH_%s' % pn, d, True) or data.getVar('CVS_TARBALL_STASH_%s' % pn, d, True) or data.getVar('SRC_TARBALL_STASH', d, True) or data.getVar('CVS_TARBALL_STASH', d, True) or "").split()
+        localcount= None
+        if 'name' in ud.parm:
+            pn = data.getVar("PN", d, 1)
+            localcount = data.getVar("LOCALCOUNT_" + ud.parm['name'], d, 1)
+        if not localcount:
+            localcount = data.getVar("LOCALCOUNT", d, 1)
+        return localcount

-        for stash in src_tarball_stash:
-            fetchcmd = data.getVar("FETCHCOMMAND_mirror", d, True) or data.getVar("FETCHCOMMAND_wget", d, True)
-            uri = stash + tarfn
-            bb.msg.note(1, bb.msg.domain.Fetcher, "fetch " + uri)
-            fetchcmd = fetchcmd.replace("${URI}", uri)
-            ret = os.system(fetchcmd)
-            if ret == 0:
-                bb.msg.note(1, bb.msg.domain.Fetcher, "Fetched %s from tarball stash, skipping checkout" % tarfn)
-                return True
-        return False
-    try_mirror = staticmethod(try_mirror)
+    localcount_internal_helper = staticmethod(localcount_internal_helper)

    def verify_md5sum(ud, got_sum):
        """
@@ -438,14 +689,7 @@ class Fetch(object):
    verify_md5sum = staticmethod(verify_md5sum)

    def write_md5sum(url, ud, d):
-        if bb.which(data.getVar('PATH', d), 'md5sum'):
-            try:
-                md5pipe = os.popen('md5sum ' + ud.localpath)
-                md5data = (md5pipe.readline().split() or [ "" ])[0]
-                md5pipe.close()
-            except OSError:
-                md5data = ""
-
+        md5data = bb.utils.md5_file(ud.localpath)
        # verify the md5sum
        if not Fetch.verify_md5sum(ud, md5data):
            raise MD5SumError(url)
@@ -463,7 +707,7 @@ class Fetch(object):
            raise ParameterError

        pd = persist_data.PersistData(d)
-        key = self._revision_key(url, ud, d)
+        key = self.generate_revision_key(url, ud, d)
        rev = pd.getValue("BB_URI_HEADREVS", key)
        if rev != None:
            return str(rev)
@@ -480,16 +724,28 @@ class Fetch(object):
            return self._sortable_revision(url, ud, d)

        pd = persist_data.PersistData(d)
-        key = self._revision_key(url, ud, d)
+        key = self.generate_revision_key(url, ud, d)
+
        latest_rev = self._build_revision(url, ud, d)
        last_rev = pd.getValue("BB_URI_LOCALCOUNT", key + "_rev")
-        count = pd.getValue("BB_URI_LOCALCOUNT", key + "_count")
+        uselocalcount = bb.data.getVar("BB_LOCALCOUNT_OVERRIDE", d, True) or False
+        count = None
+        if uselocalcount:
+            count = Fetch.localcount_internal_helper(ud, d)
+        if count is None:
+            count = pd.getValue("BB_URI_LOCALCOUNT", key + "_count")

        if last_rev == latest_rev:
            return str(count + "+" + latest_rev)

+        buildindex_provided = hasattr(self, "_sortable_buildindex")
+        if buildindex_provided:
+            count = self._sortable_buildindex(url, ud, d, latest_rev)
+
        if count is None:
            count = "0"
+        elif uselocalcount or buildindex_provided:
+            count = str(count)
        else:
            count = str(int(count) + 1)

@@ -498,6 +754,9 @@ class Fetch(object):

        return str(count + "+" + latest_rev)

+    def generate_revision_key(self, url, ud, d):
+        key = self._revision_key(url, ud, d)
+        return "%s-%s" % (key, bb.data.getVar("PN", d, True) or "")

 import cvs
 import git
@@ -509,6 +768,8 @@ import ssh
 import perforce
 import bzr
 import hg
+import osc
+import repo

 methods.append(local.Local())
 methods.append(wget.Wget())
@@ -520,3 +781,5 @@ methods.append(ssh.SSH())
 methods.append(perforce.Perforce())
 methods.append(bzr.Bzr())
 methods.append(hg.Hg())
+methods.append(osc.Osc())
+methods.append(repo.Repo())
--- a/bitbake/lib/bb/fetch/bzr.py
+++ b/bitbake/lib/bb/fetch/bzr.py
@@ -29,7 +29,6 @@ import bb
 from bb import data
 from bb.fetch import Fetch
 from bb.fetch import FetchError
-from bb.fetch import MissingParameterError
 from bb.fetch import runfetchcmd

 class Bzr(Fetch):
@@ -92,11 +91,6 @@ class Bzr(Fetch):
    def go(self, loc, ud, d):
        """Fetch url"""

-        # try to use the tarball stash
-        if Fetch.try_mirror(d, ud.localfile):
-            bb.msg.debug(1, bb.msg.domain.Fetcher, "%s already exists or was mirrored, skipping bzr checkout." % ud.localpath)
-            return
-
        if os.access(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir), '.bzr'), os.R_OK):
            bzrcmd = self._buildbzrcommand(ud, d, "update")
            bb.msg.debug(1, bb.msg.domain.Fetcher, "BZR Update %s" % loc)
--- a/bitbake/lib/bb/fetch/cvs.py
+++ b/bitbake/lib/bb/fetch/cvs.py
@@ -26,7 +26,7 @@ BitBake build tools.
 #Based on functions from the base bb module, Copyright 2003 Holger Schurig
 #

-import os, re
+import os
 import bb
 from   bb import data
 from   bb.fetch import Fetch
@@ -41,7 +41,7 @@ class Cvs(Fetch):
        """
        Check to see if a given url can be fetched with cvs.
        """
-        return ud.type in ['cvs', 'pserver']
+        return ud.type in ['cvs']

    def localpath(self, url, ud, d):
        if not "module" in ud.parm:
@@ -77,11 +77,6 @@ class Cvs(Fetch):

    def go(self, loc, ud, d):

-        # try to use the tarball stash
-        if not self.forcefetch(loc, ud, d) and Fetch.try_mirror(d, ud.localfile):
-            bb.msg.debug(1, bb.msg.domain.Fetcher, "%s already exists or was mirrored, skipping cvs checkout." % ud.localpath)
-            return
-
        method = "pserver"
        if "method" in ud.parm:
            method = ud.parm["method"]
@@ -102,7 +97,14 @@ class Cvs(Fetch):
        if method == "dir":
            cvsroot = ud.path
        else:
-            cvsroot = ":" + method + ":" + ud.user
+            cvsroot = ":" + method
+            cvsproxyhost = data.getVar('CVS_PROXY_HOST', d, True)
+            if cvsproxyhost:
+                cvsroot += ";proxy=" + cvsproxyhost
+            cvsproxyport = data.getVar('CVS_PROXY_PORT', d, True)
+            if cvsproxyport:
+                cvsroot += ";proxyport=" + cvsproxyport
+            cvsroot += ":" + ud.user
            if ud.pswd:
                cvsroot += ":" + ud.pswd
            cvsroot += "@" + ud.host + ":" + cvs_port + ud.path
@@ -111,7 +113,11 @@ class Cvs(Fetch):
        if 'norecurse' in ud.parm:
            options.append("-l")
        if ud.date:
-            options.append("-D %s" % ud.date)
+            # treat YYYYMMDDHHMM specially for CVS
+            if len(ud.date) == 12:
+                options.append("-D \"%s %s:%s UTC\"" % (ud.date[0:8], ud.date[8:10], ud.date[10:12]))
+            else:
+                options.append("-D \"%s UTC\"" % ud.date)
        if ud.tag:
            options.append("-r %s" % ud.tag)

--- a/bitbake/lib/bb/fetch/git.py
+++ b/bitbake/lib/bb/fetch/git.py
@@ -20,24 +20,20 @@ BitBake 'Fetch' git implementation
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

-import os, re
+import os
 import bb
 from   bb    import data
 from   bb.fetch import Fetch
-from   bb.fetch import FetchError
 from   bb.fetch import runfetchcmd

-def prunedir(topdir):
-    # Delete everything reachable from the directory named in 'topdir'.
-    # CAUTION:  This is dangerous!
-    for root, dirs, files in os.walk(topdir, topdown=False):
-        for name in files:
-            os.remove(os.path.join(root, name))
-        for name in dirs:
-            os.rmdir(os.path.join(root, name))
-
 class Git(Fetch):
    """Class to fetch a module or modules from git repositories"""
+    def init(self, d):
+        #
+        # Only enable _sortable revision if the key is set
+        #
+        if bb.data.getVar("BB_GIT_CLONE_FOR_SRCREV", d, True):
+            self._sortable_buildindex = self._sortable_buildindex_disabled
    def supports(self, url, ud, d):
        """
        Check to see if a given url can be fetched with git.
@@ -46,11 +42,18 @@ class Git(Fetch):

    def localpath(self, url, ud, d):

-        ud.proto = "rsync"
        if 'protocol' in ud.parm:
            ud.proto = ud.parm['protocol']
+        elif not ud.host:
+            ud.proto = 'file'
+        else:
+            ud.proto = "rsync"

-        ud.branch = ud.parm.get("branch", "")
+        ud.branch = ud.parm.get("branch", "master")
+
+        gitsrcname = '%s%s' % (ud.host, ud.path.replace('/', '.'))
+        ud.mirrortarball = 'git_%s.tar.gz' % (gitsrcname)
+        ud.clonedir = os.path.join(data.expand('${GITDIR}', d), gitsrcname)

        tag = Fetch.srcrev_internal_helper(ud, d)
        if tag is True:
@@ -58,72 +61,106 @@ class Git(Fetch):
        elif tag:
            ud.tag = tag

-        if not ud.tag:
+        if not ud.tag or ud.tag == "master":
            ud.tag = self.latest_revision(url, ud, d)	

-        if ud.tag == "master":
-            ud.tag = self.latest_revision(url, ud, d)
+        subdir = ud.parm.get("subpath", "")
+        if subdir != "":
+            if subdir.endswith("/"):
+                subdir = subdir[:-1]
+            subdirpath = os.path.join(ud.path, subdir);
+        else:
+            subdirpath = ud.path;

-        ud.localfile = data.expand('git_%s%s_%s.tar.gz' % (ud.host, ud.path.replace('/', '.'), ud.tag), d)
+        if 'fullclone' in ud.parm:
+            ud.localfile = ud.mirrortarball
+        else:
+            ud.localfile = data.expand('git_%s%s_%s.tar.gz' % (ud.host, subdirpath.replace('/', '.'), ud.tag), d)
+
+        ud.basecmd = data.getVar("FETCHCMD_git", d, True) or "git"

        return os.path.join(data.getVar("DL_DIR", d, True), ud.localfile)

    def go(self, loc, ud, d):
        """Fetch url"""

-        if Fetch.try_mirror(d, ud.localfile):
-            bb.msg.debug(1, bb.msg.domain.Fetcher, "%s already exists (or was stashed). Skipping git checkout." % ud.localpath)
-            return
+        if ud.user:
+            username = ud.user + '@'
+        else:
+            username = ""

-        gitsrcname = '%s%s' % (ud.host, ud.path.replace('/', '.'))
-
-        repofilename = 'git_%s.tar.gz' % (gitsrcname)
-        repofile = os.path.join(data.getVar("DL_DIR", d, 1), repofilename)
-        repodir = os.path.join(data.expand('${GITDIR}', d), gitsrcname)
+        repofile = os.path.join(data.getVar("DL_DIR", d, 1), ud.mirrortarball)

        coname = '%s' % (ud.tag)
-        codir = os.path.join(repodir, coname)
+        codir = os.path.join(ud.clonedir, coname)

-        if not os.path.exists(repodir):
-            if Fetch.try_mirror(d, repofilename):    
-                bb.mkdirhier(repodir)
-                os.chdir(repodir)
+        if not os.path.exists(ud.clonedir):
+            try:
+                Fetch.try_mirrors(ud.mirrortarball)
+                bb.mkdirhier(ud.clonedir)
+                os.chdir(ud.clonedir)
                runfetchcmd("tar -xzf %s" % (repofile), d)
-            else:
-                runfetchcmd("git clone -n %s://%s%s %s" % (ud.proto, ud.host, ud.path, repodir), d)
+            except:
+                runfetchcmd("%s clone -n %s://%s%s%s %s" % (ud.basecmd, ud.proto, username, ud.host, ud.path, ud.clonedir), d)

-        os.chdir(repodir)
+        os.chdir(ud.clonedir)
        # Remove all but the .git directory
-        runfetchcmd("rm * -Rf", d)
-        runfetchcmd("git fetch %s://%s%s" % (ud.proto, ud.host, ud.path), d)
-        runfetchcmd("git fetch --tags %s://%s%s" % (ud.proto, ud.host, ud.path), d)
-        runfetchcmd("git prune-packed", d)
-        runfetchcmd("git pack-redundant --all | xargs -r rm", d)
+        if not self._contains_ref(ud.tag, d):
+            runfetchcmd("rm * -Rf", d)
+            runfetchcmd("%s fetch %s://%s%s%s %s" % (ud.basecmd, ud.proto, username, ud.host, ud.path, ud.branch), d)
+            runfetchcmd("%s fetch --tags %s://%s%s%s" % (ud.basecmd, ud.proto, username, ud.host, ud.path), d)
+            runfetchcmd("%s prune-packed" % ud.basecmd, d)
+            runfetchcmd("%s pack-redundant --all | xargs -r rm" % ud.basecmd, d)

-        os.chdir(repodir)
+        os.chdir(ud.clonedir)
        mirror_tarballs = data.getVar("BB_GENERATE_MIRROR_TARBALLS", d, True)
-        if mirror_tarballs != "0": 
+        if mirror_tarballs != "0" or 'fullclone' in ud.parm: 
            bb.msg.note(1, bb.msg.domain.Fetcher, "Creating tarball of git repository")
            runfetchcmd("tar -czf %s %s" % (repofile, os.path.join(".", ".git", "*") ), d)

+        if 'fullclone' in ud.parm:
+            return
+
        if os.path.exists(codir):
-            prunedir(codir)
+            bb.utils.prunedir(codir)
+
+        subdir = ud.parm.get("subpath", "")
+        if subdir != "":
+            if subdir.endswith("/"):
+                subdirbase = os.path.basename(subdir[:-1])
+            else:
+                subdirbase = os.path.basename(subdir)
+        else:
+            subdirbase = ""
+
+        if subdir != "":
+            readpathspec = ":%s" % (subdir)
+            codir = os.path.join(codir, "git")
+            coprefix = os.path.join(codir, subdirbase, "")
+        else:
+            readpathspec = ""
+            coprefix = os.path.join(codir, "git", "")

        bb.mkdirhier(codir)
-        os.chdir(repodir)
-        runfetchcmd("git read-tree %s" % (ud.tag), d)
-        runfetchcmd("git checkout-index -q -f --prefix=%s -a" % (os.path.join(codir, "git", "")), d)
+        os.chdir(ud.clonedir)
+        runfetchcmd("%s read-tree %s%s" % (ud.basecmd, ud.tag, readpathspec), d)
+        runfetchcmd("%s checkout-index -q -f --prefix=%s -a" % (ud.basecmd, coprefix), d)

        os.chdir(codir)
        bb.msg.note(1, bb.msg.domain.Fetcher, "Creating tarball of git checkout")
        runfetchcmd("tar -czf %s %s" % (ud.localpath, os.path.join(".", "*") ), d)

-        os.chdir(repodir)
-        prunedir(codir)
+        os.chdir(ud.clonedir)
+        bb.utils.prunedir(codir)

    def suppports_srcrev(self):
        return True

+    def _contains_ref(self, tag, d):
+        basecmd = data.getVar("FETCHCMD_git", d, True) or "git"
+        output = runfetchcmd("%s log --pretty=oneline -n 1 %s -- 2> /dev/null | wc -l" % (basecmd, tag), d, quiet=True)
+        return output.split()[0] != "0"
+
    def _revision_key(self, url, ud, d):
        """
        Return a unique key for the url
@@ -134,9 +171,47 @@ class Git(Fetch):
        """
        Compute the HEAD revision for the url
        """
-        output = runfetchcmd("git ls-remote %s://%s%s %s" % (ud.proto, ud.host, ud.path, ud.branch), d, True)
+        if ud.user:
+            username = ud.user + '@'
+        else:
+            username = ""
+
+        basecmd = data.getVar("FETCHCMD_git", d, True) or "git"
+        cmd = "%s ls-remote %s://%s%s%s %s" % (basecmd, ud.proto, username, ud.host, ud.path, ud.branch)
+        output = runfetchcmd(cmd, d, True)
+        if not output:
+            raise bb.fetch.FetchError("Fetch command %s gave empty output\n" % (cmd))
        return output.split()[0]

    def _build_revision(self, url, ud, d):
        return ud.tag

+    def _sortable_buildindex_disabled(self, url, ud, d, rev):
+        """
+        Return a suitable buildindex for the revision specified. This is done by counting revisions 
+        using "git rev-list" which may or may not work in different circumstances.
+        """
+
+        cwd = os.getcwd()
+
+        # Check if we have the rev already
+
+        if not os.path.exists(ud.clonedir):
+            print "no repo"
+            self.go(None, ud, d)
+            if not os.path.exists(ud.clonedir):
+                bb.msg.error(bb.msg.domain.Fetcher, "GIT repository for %s doesn't exist in %s, cannot get sortable buildnumber, using old value" % (url, ud.clonedir))
+                return None
+
+
+        os.chdir(ud.clonedir)
+        if not self._contains_ref(rev, d):
+            self.go(None, ud, d)
+
+        output = runfetchcmd("%s rev-list %s -- 2> /dev/null | wc -l" % (ud.basecmd, rev), d, quiet=True)
+        os.chdir(cwd)
+
+        buildindex = "%s" % output.split()[0]
+        bb.msg.debug(1, bb.msg.domain.Fetcher, "GIT repository for %s in %s is returning %s revisions in rev-list before %s" % (url, ud.clonedir, buildindex, rev))
+        return buildindex        
+
--- a/bitbake/lib/bb/fetch/hg.py
+++ b/bitbake/lib/bb/fetch/hg.py
@@ -24,7 +24,7 @@ BitBake 'Fetch' implementation for mercurial DRCS (hg).
 #
 # Based on functions from the base bb module, Copyright 2003 Holger Schurig

-import os, re
+import os
 import sys
 import bb
 from bb import data
@@ -57,6 +57,14 @@ class Hg(Fetch):

        if 'rev' in ud.parm:
            ud.revision = ud.parm['rev']
+        else:
+            tag = Fetch.srcrev_internal_helper(ud, d)
+            if tag is True:
+                ud.revision = self.latest_revision(url, ud, d)
+            elif tag:
+                ud.revision = tag
+            else:
+                ud.revision = self.latest_revision(url, ud, d)

        ud.localfile = data.expand('%s_%s_%s_%s.tar.gz' % (ud.module.replace('/', '.'), ud.host, ud.path.replace('/', '.'), ud.revision), d)

@@ -79,7 +87,10 @@ class Hg(Fetch):
            host = "/"
            ud.host = "localhost"

-        hgroot = host + ud.path
+        if not ud.user:
+            hgroot = host + ud.path
+        else:
+            hgroot = ud.user + "@" + host + ud.path

        if command is "info":
            return "%s identify -i %s://%s/%s" % (basecmd, proto, hgroot, ud.module)
@@ -91,7 +102,10 @@ class Hg(Fetch):
        if command is "fetch":
            cmd = "%s clone %s %s://%s/%s %s" % (basecmd, " ".join(options), proto, hgroot, ud.module, ud.module)
        elif command is "pull":
-            cmd = "%s pull %s" % (basecmd, " ".join(options))
+            # do not pass options list; limiting pull to rev causes the local
+            # repo not to contain it and immediately following "update" command
+            # will crash
+            cmd = "%s pull" % (basecmd)
        elif command is "update":
            cmd = "%s update -C %s" % (basecmd, " ".join(options))
        else:
@@ -102,11 +116,6 @@ class Hg(Fetch):
    def go(self, loc, ud, d):
        """Fetch url"""

-        # try to use the tarball stash
-        if Fetch.try_mirror(d, ud.localfile):
-            bb.msg.debug(1, bb.msg.domain.Fetcher, "%s already exists or was mirrored, skipping hg checkout." % ud.localpath)
-            return
-
        bb.msg.debug(2, bb.msg.domain.Fetcher, "Fetch: checking for module directory '" + ud.moddir + "'")

        if os.access(os.path.join(ud.moddir, '.hg'), os.R_OK):
@@ -117,9 +126,6 @@ class Hg(Fetch):
            bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % updatecmd)
            runfetchcmd(updatecmd, d)

-            updatecmd = self._buildhgcommand(ud, d, "update")
-            bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % updatecmd)
-            runfetchcmd(updatecmd, d)
        else:
            fetchcmd = self._buildhgcommand(ud, d, "fetch")
            bb.msg.note(1, bb.msg.domain.Fetcher, "Fetch " + loc)
@@ -128,6 +134,12 @@ class Hg(Fetch):
            os.chdir(ud.pkgdir)
            bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % fetchcmd)
            runfetchcmd(fetchcmd, d)
+	
+	# Even when we clone (fetch), we still need to update as hg's clone
+	# won't checkout the specified revision if its on a branch
+        updatecmd = self._buildhgcommand(ud, d, "update")
+        bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % updatecmd)
+        runfetchcmd(updatecmd, d)

        os.chdir(ud.pkgdir)
        try:
@@ -139,3 +151,23 @@ class Hg(Fetch):
            except OSError:
                pass
            raise t, v, tb
+
+    def suppports_srcrev(self):
+        return True
+
+    def _latest_revision(self, url, ud, d):
+        """
+        Compute tip revision for the url
+        """
+        output = runfetchcmd(self._buildhgcommand(ud, d, "info"), d)
+        return output.strip()
+
+    def _build_revision(self, url, ud, d):
+        return ud.revision
+
+    def _revision_key(self, url, ud, d):
+        """
+        Return a unique key for the url
+        """
+        return "hg:" + ud.moddir
+
--- a/bitbake/lib/bb/fetch/local.py
+++ b/bitbake/lib/bb/fetch/local.py
@@ -25,7 +25,7 @@ BitBake build tools.
 #
 # Based on functions from the base bb module, Copyright 2003 Holger Schurig

-import os, re
+import os
 import bb
 from   bb import data
 from   bb.fetch import Fetch
@@ -33,9 +33,9 @@ from   bb.fetch import Fetch
 class Local(Fetch):
    def supports(self, url, urldata, d):
        """
-        Check to see if a given url can be fetched with cvs.
+        Check to see if a given url represents a local fetch.
        """
-        return urldata.type in ['file','patch']
+        return urldata.type in ['file']

    def localpath(self, url, urldata, d):
        """
@@ -59,3 +59,14 @@ class Local(Fetch):
        """Fetch urls (no-op for Local method)"""
        # no need to fetch local files, we'll deal with them in place.
        return 1
+
+    def checkstatus(self, url, urldata, d):
+        """
+        Check the status of the url
+        """
+        if urldata.localpath.find("*") != -1:
+            bb.msg.note(1, bb.msg.domain.Fetcher, "URL %s looks like a glob and was therefore not checked." % url)	
+	    return True
+        if os.path.exists(urldata.localpath):
+           return True
+        return False
--- a/bitbake/lib/bb/fetch/osc.py
+++ b/bitbake/lib/bb/fetch/osc.py
@@ -0,0 +1,150 @@
+# ex:ts=4:sw=4:sts=4:et
+# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
+"""
+Bitbake "Fetch" implementation for osc (Opensuse build service client).
+Based on the svn "Fetch" implementation.
+
+"""
+
+import  os
+import  sys
+import  bb
+from    bb       import data
+from    bb.fetch import Fetch
+from    bb.fetch import FetchError
+from    bb.fetch import MissingParameterError
+from    bb.fetch import runfetchcmd
+
+class Osc(Fetch):
+    """Class to fetch a module or modules from Opensuse build server 
+       repositories."""
+
+    def supports(self, url, ud, d):
+        """
+        Check to see if a given url can be fetched with osc.
+        """
+        return ud.type in ['osc']
+
+    def localpath(self, url, ud, d):
+        if not "module" in ud.parm:
+            raise MissingParameterError("osc method needs a 'module' parameter.")
+
+        ud.module = ud.parm["module"]
+
+        # Create paths to osc checkouts
+        relpath = ud.path
+        if relpath.startswith('/'):
+            # Remove leading slash as os.path.join can't cope
+            relpath = relpath[1:]
+        ud.pkgdir = os.path.join(data.expand('${OSCDIR}', d), ud.host)
+        ud.moddir = os.path.join(ud.pkgdir, relpath, ud.module)
+
+        if 'rev' in ud.parm:
+            ud.revision = ud.parm['rev']
+        else:
+            pv = data.getVar("PV", d, 0)
+            rev = Fetch.srcrev_internal_helper(ud, d)
+            if rev and rev != True:
+                ud.revision = rev
+            else:
+                ud.revision = ""
+
+        ud.localfile = data.expand('%s_%s_%s.tar.gz' % (ud.module.replace('/', '.'), ud.path.replace('/', '.'), ud.revision), d)
+
+        return os.path.join(data.getVar("DL_DIR", d, True), ud.localfile)
+
+    def _buildosccommand(self, ud, d, command):
+        """
+        Build up an ocs commandline based on ud
+        command is "fetch", "update", "info"
+        """
+
+        basecmd = data.expand('${FETCHCMD_osc}', d)
+
+        proto = "ocs"
+        if "proto" in ud.parm:
+            proto = ud.parm["proto"]
+        
+        options = []
+
+        config = "-c %s" % self.generate_config(ud, d)
+
+        if ud.revision:
+            options.append("-r %s" % ud.revision)
+
+        coroot = ud.path
+        if coroot.startswith('/'):
+            # Remove leading slash as os.path.join can't cope
+            coroot= coroot[1:]
+
+        if command is "fetch":
+            osccmd = "%s %s co %s/%s %s" % (basecmd, config, coroot, ud.module, " ".join(options))
+        elif command is "update":
+            osccmd = "%s %s up %s" % (basecmd, config, " ".join(options))
+        else:
+            raise FetchError("Invalid osc command %s" % command)
+
+        return osccmd
+
+    def go(self, loc, ud, d):
+        """
+        Fetch url
+        """
+
+        bb.msg.debug(2, bb.msg.domain.Fetcher, "Fetch: checking for module directory '" + ud.moddir + "'")
+
+        if os.access(os.path.join(data.expand('${OSCDIR}', d), ud.path, ud.module), os.R_OK):
+            oscupdatecmd = self._buildosccommand(ud, d, "update")
+            bb.msg.note(1, bb.msg.domain.Fetcher, "Update "+ loc)
+            # update sources there
+            os.chdir(ud.moddir)
+            bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % oscupdatecmd)
+            runfetchcmd(oscupdatecmd, d)
+        else:
+            oscfetchcmd = self._buildosccommand(ud, d, "fetch")
+            bb.msg.note(1, bb.msg.domain.Fetcher, "Fetch " + loc)
+            # check out sources there
+            bb.mkdirhier(ud.pkgdir)
+            os.chdir(ud.pkgdir)
+            bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s" % oscfetchcmd)
+            runfetchcmd(oscfetchcmd, d)
+        
+        os.chdir(os.path.join(ud.pkgdir + ud.path))
+        # tar them up to a defined filename
+        try:
+            runfetchcmd("tar -czf %s %s" % (ud.localpath, ud.module), d)
+        except:
+            t, v, tb = sys.exc_info()
+            try:
+                os.unlink(ud.localpath)
+            except OSError:
+                pass
+            raise t, v, tb
+
+    def supports_srcrev(self):
+        return False
+
+    def generate_config(self, ud, d):
+        """
+        Generate a .oscrc to be used for this run.
+        """
+
+        config_path = "%s/oscrc" % data.expand('${OSCDIR}', d)
+        if (os.path.exists(config_path)):
+            os.remove(config_path) 
+
+        f = open(config_path, 'w')
+        f.write("[general]\n")
+        f.write("apisrv = %s\n" % ud.host)
+        f.write("scheme = http\n")
+        f.write("su-wrapper = su -c\n")
+        f.write("build-root = %s\n" % data.expand('${WORKDIR}', d))
+        f.write("urllist = http://moblin-obs.jf.intel.com:8888/build/%(project)s/%(repository)s/%(buildarch)s/:full/%(name)s.rpm\n")
+        f.write("extra-pkgs = gzip\n")
+        f.write("\n")
+        f.write("[%s]\n" % ud.host)
+        f.write("user = %s\n" % ud.parm["user"])
+        f.write("pass = %s\n" % ud.parm["pswd"])
+        f.close()
+        
+        return config_path
--- a/bitbake/lib/bb/fetch/perforce.py
+++ b/bitbake/lib/bb/fetch/perforce.py
@@ -25,12 +25,11 @@ BitBake build tools.
 #
 # Based on functions from the base bb module, Copyright 2003 Holger Schurig

-import os, re
+import os
 import bb
 from   bb import data
 from   bb.fetch import Fetch
 from   bb.fetch import FetchError
-from   bb.fetch import MissingParameterError

 class Perforce(Fetch):
    def supports(self, url, ud, d):
@@ -67,14 +66,15 @@ class Perforce(Fetch):
    doparse = staticmethod(doparse)

    def getcset(d, depot,host,user,pswd,parm):
+        p4opt = ""
        if "cset" in parm:
            return parm["cset"];
        if user:
-            data.setVar('P4USER', user, d)
+            p4opt += " -u %s" % (user)
        if pswd:
-            data.setVar('P4PASSWD', pswd, d)
+            p4opt += " -P %s" % (pswd)
        if host:
-            data.setVar('P4PORT', host, d)
+            p4opt += " -p %s" % (host)

        p4date = data.getVar("P4DATE", d, 1)
        if "revision" in parm:
@@ -85,8 +85,8 @@ class Perforce(Fetch):
            depot += "@%s" % (p4date)

        p4cmd = data.getVar('FETCHCOMMAND_p4', d, 1)
-        bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s changes -m 1 %s" % (p4cmd, depot))
-        p4file = os.popen("%s changes -m 1 %s" % (p4cmd,depot))
+        bb.msg.debug(1, bb.msg.domain.Fetcher, "Running %s%s changes -m 1 %s" % (p4cmd, p4opt, depot))
+        p4file = os.popen("%s%s changes -m 1 %s" % (p4cmd, p4opt, depot))
        cset = p4file.readline().strip()
        bb.msg.debug(1, bb.msg.domain.Fetcher, "READ %s" % (cset))
        if not cset:
@@ -124,11 +124,6 @@ class Perforce(Fetch):
        Fetch urls
        """

-        # try to use the tarball stash
-        if Fetch.try_mirror(d, ud.localfile):
-            bb.msg.debug(1, bb.msg.domain.Fetcher, "%s already exists or was mirrored, skipping perforce checkout." % ud.localpath)
-            return
-
        (host,depot,user,pswd,parm) = Perforce.doparse(loc, d)

        if depot.find('/...') != -1:
@@ -146,14 +141,15 @@ class Perforce(Fetch):
        data.update_data(localdata)

        # Get the p4 command
+        p4opt = ""
        if user:
-            data.setVar('P4USER', user, localdata)
+            p4opt += " -u %s" % (user)

        if pswd:
-            data.setVar('P4PASSWD', pswd, localdata)
+            p4opt += " -P %s" % (pswd)

        if host:
-            data.setVar('P4PORT', host, localdata)
+            p4opt += " -p %s" % (host)

        p4cmd = data.getVar('FETCHCOMMAND', localdata, 1)

@@ -175,8 +171,8 @@ class Perforce(Fetch):

        os.chdir(tmpfile)
        bb.msg.note(1, bb.msg.domain.Fetcher, "Fetch " + loc)
-        bb.msg.note(1, bb.msg.domain.Fetcher, "%s files %s" % (p4cmd, depot))
-        p4file = os.popen("%s files %s" % (p4cmd, depot))
+        bb.msg.note(1, bb.msg.domain.Fetcher, "%s%s files %s" % (p4cmd, p4opt, depot))
+        p4file = os.popen("%s%s files %s" % (p4cmd, p4opt, depot))

        if not p4file:
            bb.error("Fetch: unable to get the P4 files from %s" % (depot))
@@ -193,7 +189,7 @@ class Perforce(Fetch):
            dest = list[0][len(path)+1:]
            where = dest.find("#")

-            os.system("%s print -o %s/%s %s" % (p4cmd, module,dest[:where],list[0]))
+            os.system("%s%s print -o %s/%s %s" % (p4cmd, p4opt, module,dest[:where],list[0]))
            count = count + 1
            
        if count == 0:
--- a/bitbake/lib/bb/fetch/repo.py
+++ b/bitbake/lib/bb/fetch/repo.py
@@ -0,0 +1,106 @@
+# ex:ts=4:sw=4:sts=4:et
+# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
+"""
+BitBake "Fetch" repo (git) implementation
+
+"""
+
+# Copyright (C) 2009 Tom Rini <trini@embeddedalley.com>
+#
+# Based on git.py which is:
+#Copyright (C) 2005 Richard Purdie
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import os, re
+import bb
+from   bb    import data
+from   bb.fetch import Fetch
+from   bb.fetch import FetchError
+from   bb.fetch import runfetchcmd
+
+class Repo(Fetch):
+    """Class to fetch a module or modules from repo (git) repositories"""
+    def supports(self, url, ud, d):
+        """
+        Check to see if a given url can be fetched with repo.
+        """
+        return ud.type in ["repo"]
+
+    def localpath(self, url, ud, d):
+        """
+        We don"t care about the git rev of the manifests repository, but
+        we do care about the manifest to use.  The default is "default".
+        We also care about the branch or tag to be used.  The default is
+        "master".
+        """
+
+        if "protocol" in ud.parm:
+            ud.proto = ud.parm["protocol"]
+        else:
+            ud.proto = "git"
+
+        if "branch" in ud.parm:
+            ud.branch = ud.parm["branch"]
+        else:
+            ud.branch = "master"
+
+        if "manifest" in ud.parm:
+            manifest = ud.parm["manifest"]
+            if manifest.endswith(".xml"):
+                ud.manifest = manifest
+            else:
+                ud.manifest = manifest + ".xml"
+        else:
+            ud.manifest = "default.xml"
+
+        ud.localfile = data.expand("repo_%s%s_%s_%s.tar.gz" % (ud.host, ud.path.replace("/", "."), ud.manifest, ud.branch), d)
+
+        return os.path.join(data.getVar("DL_DIR", d, True), ud.localfile)
+
+    def go(self, loc, ud, d):
+        """Fetch url"""
+
+        if os.access(os.path.join(data.getVar("DL_DIR", d, True), ud.localfile), os.R_OK):
+            bb.msg.debug(1, bb.msg.domain.Fetcher, "%s already exists (or was stashed). Skipping repo init / sync." % ud.localpath)
+            return
+
+        gitsrcname = "%s%s" % (ud.host, ud.path.replace("/", "."))
+        repodir = data.getVar("REPODIR", d, True) or os.path.join(data.getVar("DL_DIR", d, True), "repo")
+        codir = os.path.join(repodir, gitsrcname, ud.manifest)
+
+        if ud.user:
+            username = ud.user + "@"
+        else:
+            username = ""
+
+        bb.mkdirhier(os.path.join(codir, "repo"))
+        os.chdir(os.path.join(codir, "repo"))
+        if not os.path.exists(os.path.join(codir, "repo", ".repo")):
+            runfetchcmd("repo init -m %s -b %s -u %s://%s%s%s" % (ud.manifest, ud.branch, ud.proto, username, ud.host, ud.path), d)
+
+        runfetchcmd("repo sync", d)
+        os.chdir(codir)
+
+        # Create a cache
+        runfetchcmd("tar --exclude=.repo --exclude=.git -czf %s %s" % (ud.localpath, os.path.join(".", "*") ), d)
+
+    def suppports_srcrev(self):
+        return False
+
+    def _build_revision(self, url, ud, d):
+        return ud.manifest
+
+    def _want_sortable_revision(self, url, ud, d):
+        return False
--- a/bitbake/lib/bb/fetch/ssh.py
+++ b/bitbake/lib/bb/fetch/ssh.py
@@ -37,11 +37,9 @@ IETF secsh internet draft:
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 import re, os
-import bb
 from   bb import data
 from   bb.fetch import Fetch
 from   bb.fetch import FetchError
-from   bb.fetch import MissingParameterError


 __pattern__ = re.compile(r'''
--- a/bitbake/lib/bb/fetch/svk.py
+++ b/bitbake/lib/bb/fetch/svk.py
@@ -25,7 +25,7 @@ This implementation is for svk. It is based on the svn implementation
 #
 # Based on functions from the base bb module, Copyright 2003 Holger Schurig

-import os, re
+import os
 import bb
 from   bb import data
 from   bb.fetch import Fetch
@@ -36,7 +36,7 @@ class Svk(Fetch):
    """Class to fetch a module or modules from svk repositories"""
    def supports(self, url, ud, d):
        """
-        Check to see if a given url can be fetched with cvs.
+        Check to see if a given url can be fetched with svk.
        """
        return ud.type in ['svk']

@@ -62,15 +62,12 @@ class Svk(Fetch):
    def go(self, loc, ud, d):
        """Fetch urls"""

-        if not self.forcefetch(loc, ud, d) and Fetch.try_mirror(d, ud.localfile):
-            return
-
        svkroot = ud.host + ud.path

-        svkcmd = "svk co -r {%s} %s/%s" % (date, svkroot, ud.module)
+        svkcmd = "svk co -r {%s} %s/%s" % (ud.date, svkroot, ud.module)

        if ud.revision:
-            svkcmd = "svk co -r %s/%s" % (ud.revision, svkroot, ud.module)
+            svkcmd = "svk co -r %s %s/%s" % (ud.revision, svkroot, ud.module)

        # create temp directory
        localdata = data.createCopy(d)
--- a/bitbake/lib/bb/fetch/svn.py
+++ b/bitbake/lib/bb/fetch/svn.py
@@ -23,7 +23,7 @@ BitBake 'Fetch' implementation for svn.
 #
 # Based on functions from the base bb module, Copyright 2003 Holger Schurig

-import os, re
+import os
 import sys
 import bb
 from   bb import data
@@ -114,13 +114,15 @@ class Svn(Fetch):
        if command is "info":
            svncmd = "%s info %s %s://%s/%s/" % (basecmd, " ".join(options), proto, svnroot, ud.module)
        else:
+            suffix = ""
            if ud.revision:
                options.append("-r %s" % ud.revision)
+                suffix = "@%s" % (ud.revision)
            elif ud.date:
                options.append("-r {%s}" % ud.date)

            if command is "fetch":
-                svncmd = "%s co %s %s://%s/%s %s" % (basecmd, " ".join(options), proto, svnroot, ud.module, ud.module)
+                svncmd = "%s co %s %s://%s/%s%s %s" % (basecmd, " ".join(options), proto, svnroot, ud.module, suffix, ud.module)
            elif command is "update":
                svncmd = "%s update %s" % (basecmd, " ".join(options))
            else:
@@ -134,11 +136,6 @@ class Svn(Fetch):
    def go(self, loc, ud, d):
        """Fetch url"""

-        # try to use the tarball stash
-        if Fetch.try_mirror(d, ud.localfile):
-            bb.msg.debug(1, bb.msg.domain.Fetcher, "%s already exists or was mirrored, skipping svn checkout." % ud.localpath)
-            return
-
        bb.msg.debug(2, bb.msg.domain.Fetcher, "Fetch: checking for module directory '" + ud.moddir + "'")

        if os.access(os.path.join(ud.moddir, '.svn'), os.R_OK):
--- a/bitbake/lib/bb/fetch/wget.py
+++ b/bitbake/lib/bb/fetch/wget.py
@@ -25,18 +25,17 @@ BitBake build tools.
 #
 # Based on functions from the base bb module, Copyright 2003 Holger Schurig

-import os, re
+import os
 import bb
 from   bb import data
 from   bb.fetch import Fetch
 from   bb.fetch import FetchError
-from   bb.fetch import uri_replace

 class Wget(Fetch):
    """Class to fetch urls via 'wget'"""
    def supports(self, url, ud, d):
        """
-        Check to see if a given url can be fetched with cvs.
+        Check to see if a given url can be fetched with wget.
        """
        return ud.type in ['http','https','ftp']

@@ -48,19 +47,46 @@ class Wget(Fetch):

        return os.path.join(data.getVar("DL_DIR", d, True), ud.localfile)

-    def go(self, uri, ud, d):
+    def go(self, uri, ud, d, checkonly = False):
        """Fetch urls"""

        def fetch_uri(uri, ud, d):
-            if os.path.exists(ud.localpath):
+            if checkonly:
+                fetchcmd = data.getVar("CHECKCOMMAND", d, 1)
+            elif os.path.exists(ud.localpath):
                # file exists, but we didnt complete it.. trying again..
                fetchcmd = data.getVar("RESUMECOMMAND", d, 1)
            else:
                fetchcmd = data.getVar("FETCHCOMMAND", d, 1)

+            uri = uri.split(";")[0]
+            uri_decoded = list(bb.decodeurl(uri))
+            uri_type = uri_decoded[0]
+            uri_host = uri_decoded[1]
+
            bb.msg.note(1, bb.msg.domain.Fetcher, "fetch " + uri)
-            fetchcmd = fetchcmd.replace("${URI}", uri)
+            fetchcmd = fetchcmd.replace("${URI}", uri.split(";")[0])
            fetchcmd = fetchcmd.replace("${FILE}", ud.basename)
+            httpproxy = None
+            ftpproxy = None
+            if uri_type == 'http':
+                httpproxy = data.getVar("HTTP_PROXY", d, True)
+                httpproxy_ignore = (data.getVar("HTTP_PROXY_IGNORE", d, True) or "").split()
+                for p in httpproxy_ignore:
+                    if uri_host.endswith(p):
+                        httpproxy = None
+                        break
+            if uri_type == 'ftp':
+                ftpproxy = data.getVar("FTP_PROXY", d, True)
+                ftpproxy_ignore = (data.getVar("HTTP_PROXY_IGNORE", d, True) or "").split()
+                for p in ftpproxy_ignore:
+                    if uri_host.endswith(p):
+                        ftpproxy = None
+                        break
+            if httpproxy:
+                fetchcmd = "http_proxy=" + httpproxy + " " + fetchcmd
+            if ftpproxy:
+                fetchcmd = "ftp_proxy=" + ftpproxy + " " + fetchcmd
            bb.msg.debug(2, bb.msg.domain.Fetcher, "executing " + fetchcmd)
            ret = os.system(fetchcmd)
            if ret != 0:
@@ -68,7 +94,7 @@ class Wget(Fetch):

            # Sanity check since wget can pretend it succeed when it didn't
            # Also, this used to happen if sourceforge sent us to the mirror page
-            if not os.path.exists(ud.localpath):
+            if not os.path.exists(ud.localpath) and not checkonly:
                bb.msg.debug(2, bb.msg.domain.Fetcher, "The fetch command for %s returned success but %s doesn't exist?..." % (uri, ud.localpath))
                return False

@@ -78,22 +104,11 @@ class Wget(Fetch):
        data.setVar('OVERRIDES', "wget:" + data.getVar('OVERRIDES', localdata), localdata)
        data.update_data(localdata)

-        premirrors = [ i.split() for i in (data.getVar('PREMIRRORS', localdata, 1) or "").split('\n') if i ]
-        for (find, replace) in premirrors:
-            newuri = uri_replace(uri, find, replace, d)
-            if newuri != uri:
-                if fetch_uri(newuri, ud, localdata):
-                    return
-
        if fetch_uri(uri, ud, localdata):
-            return
-
-        # try mirrors
-        mirrors = [ i.split() for i in (data.getVar('MIRRORS', localdata, 1) or "").split('\n') if i ]
-        for (find, replace) in mirrors:
-            newuri = uri_replace(uri, find, replace, d)
-            if newuri != uri:
-                if fetch_uri(newuri, ud, localdata):
-                    return
+            return True

        raise FetchError(uri)
+
+
+    def checkstatus(self, uri, ud, d):
+        return self.go(uri, ud, d, True)
--- a/bitbake/lib/bb/manifest.py
+++ b/bitbake/lib/bb/manifest.py
@@ -1,144 +0,0 @@
-# ex:ts=4:sw=4:sts=4:et
-# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
-#
-# Copyright (C) 2003, 2004  Chris Larson
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-import os, sys
-import bb, bb.data
-
-def getfields(line):
-    fields = {}
-    fieldmap = ( "pkg", "src", "dest", "type", "mode", "uid", "gid", "major", "minor", "start", "inc", "count" )
-    for f in xrange(len(fieldmap)):
-        fields[fieldmap[f]] = None
-
-    if not line:
-        return None
-
-    splitline = line.split()
-    if not len(splitline):
-        return None
-
-    try:
-        for f in xrange(len(fieldmap)):
-            if splitline[f] == '-':
-                continue
-            fields[fieldmap[f]] = splitline[f]
-    except IndexError:
-        pass
-    return fields
-
-def parse (mfile, d):
-    manifest = []
-    while 1:
-        line = mfile.readline()
-        if not line:
-            break
-        if line.startswith("#"):
-            continue
-        fields = getfields(line)
-        if not fields:
-            continue
-        manifest.append(fields)
-    return manifest
-
-def emit (func, manifest, d):
-#str = "%s () {\n" % func
-    str = ""
-    for line in manifest:
-        emittedline = emit_line(func, line, d)
-        if not emittedline:
-            continue
-        str += emittedline + "\n"
-#       str += "}\n"
-    return str
-
-def mangle (func, line, d):
-    import copy
-    newline = copy.copy(line)
-    src = bb.data.expand(newline["src"], d)
-
-    if src:
-        if not os.path.isabs(src):
-            src = "${WORKDIR}/" + src
-
-    dest = newline["dest"]
-    if not dest:
-        return
-
-    if dest.startswith("/"):
-        dest = dest[1:]
-
-    if func is "do_install":
-        dest = "${D}/" + dest
-
-    elif func is "do_populate":
-        dest = "${WORKDIR}/install/" + newline["pkg"] + "/" + dest
-
-    elif func is "do_stage":
-        varmap = {}
-        varmap["${bindir}"] = "${STAGING_DIR}/${HOST_SYS}/bin"
-        varmap["${libdir}"] = "${STAGING_DIR}/${HOST_SYS}/lib"
-        varmap["${includedir}"] = "${STAGING_DIR}/${HOST_SYS}/include"
-        varmap["${datadir}"] = "${STAGING_DATADIR}"
-
-        matched = 0
-        for key in varmap.keys():
-            if dest.startswith(key):
-                dest = varmap[key] + "/" + dest[len(key):]
-                matched = 1
-        if not matched:
-            newline = None
-            return
-    else:
-        newline = None
-        return
-
-    newline["src"] = src
-    newline["dest"] = dest
-    return newline
-
-def emit_line (func, line, d):
-    import copy
-    newline = copy.deepcopy(line)
-    newline = mangle(func, newline, d)
-    if not newline:
-        return None
-
-    str = ""
-    type = newline["type"]
-    mode = newline["mode"]
-    src = newline["src"]
-    dest = newline["dest"]
-    if type is "d":
-        str = "install -d "
-        if mode:
-            str += "-m %s " % mode
-        str += dest
-    elif type is "f":
-        if not src:
-            return None
-        if dest.endswith("/"):
-            str = "install -d "
-            str += dest + "\n"
-            str += "install "
-        else:
-            str = "install -D "
-        if mode:
-            str += "-m %s " % mode
-        str += src + " " + dest
-    del newline
-    return str
--- a/bitbake/lib/bb/msg.py
+++ b/bitbake/lib/bb/msg.py
@@ -22,8 +22,8 @@ Message handling infrastructure for bitbake
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

-import sys, os, re, bb
-from bb import utils, event
+import sys, bb
+from bb import event

 debug_level = {}

@@ -47,9 +47,9 @@ domain = bb.utils.Enum(
 class MsgBase(bb.event.Event):
    """Base class for messages"""

-    def __init__(self, msg, d ):
+    def __init__(self, msg):
        self._message = msg
-        event.Event.__init__(self, d)
+        event.Event.__init__(self)

 class MsgDebug(MsgBase):
    """Debug Message"""
@@ -97,33 +97,29 @@ def set_debug_domains(domains):
 #

 def debug(level, domain, msg, fn = None):
-    bb.event.fire(MsgDebug(msg, None))
    if not domain:
        domain = 'default'
    if debug_level[domain] >= level:
-        print 'DEBUG: ' + msg
+        bb.event.fire(MsgDebug(msg), None)

 def note(level, domain, msg, fn = None):
-    bb.event.fire(MsgNote(msg, None))
    if not domain:
        domain = 'default'
    if level == 1 or verbose or debug_level[domain] >= 1:
-        print 'NOTE: ' + msg
+        bb.event.fire(MsgNote(msg), None)

 def warn(domain, msg, fn = None):
-    bb.event.fire(MsgWarn(msg, None))
-    print 'WARNING: ' + msg
+    bb.event.fire(MsgWarn(msg), None)

 def error(domain, msg, fn = None):
-    bb.event.fire(MsgError(msg, None))
+    bb.event.fire(MsgError(msg), None)
    print 'ERROR: ' + msg

 def fatal(domain, msg, fn = None):
-    bb.event.fire(MsgFatal(msg, None))
-    print 'ERROR: ' + msg
+    bb.event.fire(MsgFatal(msg), None)
+    print 'FATAL: ' + msg
    sys.exit(1)

 def plain(msg, fn = None):
-    bb.event.fire(MsgPlain(msg, None))
-    print msg
+    bb.event.fire(MsgPlain(msg), None)

--- a/bitbake/lib/bb/parse/init.py
+++ b/bitbake/lib/bb/parse/init.py
@@ -50,6 +50,10 @@ def cached_mtime_noerror(f):
            return 0
    return __mtime_cache[f]

+def update_mtime(f):
+    __mtime_cache[f] = os.stat(f)[8]
+    return __mtime_cache[f]
+
 def mark_dependency(d, f):
    if f.startswith('./'):
        f = "%s/%s" % (os.getcwd(), f[2:])
@@ -76,5 +80,34 @@ def init(fn, data):
        if h['supports'](fn):
            return h['init'](data)

+def resolve_file(fn, d):
+    if not os.path.isabs(fn):
+        fn = bb.which(bb.data.getVar("BBPATH", d, 1), fn)
+        if not fn:
+            raise IOError("file %s not found" % fn)

-from parse_py import __version__, ConfHandler, BBHandler
+    bb.msg.debug(2, bb.msg.domain.Parsing, "LOAD %s" % fn)
+    return fn
+
+# Used by OpenEmbedded metadata
+__pkgsplit_cache__={}
+def vars_from_file(mypkg, d):
+    if not mypkg:
+        return (None, None, None)
+    if mypkg in __pkgsplit_cache__:
+        return __pkgsplit_cache__[mypkg]
+
+    myfile = os.path.splitext(os.path.basename(mypkg))
+    parts = myfile[0].split('_')
+    __pkgsplit_cache__[mypkg] = parts
+    if len(parts) > 3:
+        raise ParseError("Unable to generate default variables from the filename: %s (too many underscores)" % mypkg)
+    exp = 3 - len(parts)
+    tmplist = []
+    while exp != 0:
+        exp -= 1
+        tmplist.append(None)
+    parts.extend(tmplist)
+    return parts
+
+from bb.parse.parse_py import __version__, ConfHandler, BBHandler
--- a/bitbake/lib/bb/parse/ast.py
+++ b/bitbake/lib/bb/parse/ast.py
@@ -0,0 +1,451 @@
+# ex:ts=4:sw=4:sts=4:et
+# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
+"""
+ AbstractSyntaxTree classes for the Bitbake language
+"""
+
+# Copyright (C) 2003, 2004 Chris Larson
+# Copyright (C) 2003, 2004 Phil Blundell
+# Copyright (C) 2009 Holger Hans Peter Freyther
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import bb, re, string
+from itertools import chain
+
+__word__ = re.compile(r"\S+")
+__parsed_methods__ = bb.methodpool.get_parsed_dict()
+_bbversions_re = re.compile(r"\[(?P<from>[0-9]+)-(?P<to>[0-9]+)\]")
+
+class StatementGroup(list):
+    def eval(self, data):
+        map(lambda x: x.eval(data), self)
+
+class AstNode(object):
+    pass
+
+class IncludeNode(AstNode):
+    def __init__(self, what_file, fn, lineno, force):
+        self.what_file = what_file
+        self.from_fn = fn
+        self.from_lineno = lineno
+        self.force = force
+
+    def eval(self, data):
+        """
+        Include the file and evaluate the statements
+        """
+        s = bb.data.expand(self.what_file, data)
+        bb.msg.debug(3, bb.msg.domain.Parsing, "CONF %s:%d: including %s" % (self.from_fn, self.from_lineno, s))
+
+        # TODO: Cache those includes... maybe not here though
+        if self.force:
+            bb.parse.ConfHandler.include(self.from_fn, s, data, "include required")
+        else:
+            bb.parse.ConfHandler.include(self.from_fn, s, data, False)
+
+class ExportNode(AstNode):
+    def __init__(self, var):
+        self.var = var
+
+    def eval(self, data):
+        bb.data.setVarFlag(self.var, "export", 1, data)
+
+class DataNode(AstNode):
+    """
+    Various data related updates. For the sake of sanity
+    we have one class doing all this. This means that all
+    this need to be re-evaluated... we might be able to do
+    that faster with multiple classes.
+    """
+    def __init__(self, groupd):
+        self.groupd = groupd
+
+    def getFunc(self, key, data):
+        if 'flag' in self.groupd and self.groupd['flag'] != None:
+            return bb.data.getVarFlag(key, self.groupd['flag'], data)
+        else:
+            return bb.data.getVar(key, data)
+
+    def eval(self, data):
+        groupd = self.groupd
+        key = groupd["var"]
+        if "exp" in groupd and groupd["exp"] != None:
+            bb.data.setVarFlag(key, "export", 1, data)
+        if "ques" in groupd and groupd["ques"] != None:
+            val = self.getFunc(key, data)
+            if val == None:
+                val = groupd["value"]
+        elif "colon" in groupd and groupd["colon"] != None:
+            e = data.createCopy()
+            bb.data.update_data(e)
+            val = bb.data.expand(groupd["value"], e)
+        elif "append" in groupd and groupd["append"] != None:
+            val = "%s %s" % ((self.getFunc(key, data) or ""), groupd["value"])
+        elif "prepend" in groupd and groupd["prepend"] != None:
+            val = "%s %s" % (groupd["value"], (self.getFunc(key, data) or ""))
+        elif "postdot" in groupd and groupd["postdot"] != None:
+            val = "%s%s" % ((self.getFunc(key, data) or ""), groupd["value"])
+        elif "predot" in groupd and groupd["predot"] != None:
+            val = "%s%s" % (groupd["value"], (self.getFunc(key, data) or ""))
+        else:
+            val = groupd["value"]
+
+        if 'flag' in groupd and groupd['flag'] != None:
+            bb.msg.debug(3, bb.msg.domain.Parsing, "setVarFlag(%s, %s, %s, data)" % (key, groupd['flag'], val))
+            bb.data.setVarFlag(key, groupd['flag'], val, data)
+        elif groupd["lazyques"]:
+            assigned = bb.data.getVar("__lazy_assigned", data) or []
+            assigned.append(key)
+            bb.data.setVar("__lazy_assigned", assigned, data)
+            bb.data.setVarFlag(key, "defaultval", val, data)
+        else:
+            bb.data.setVar(key, val, data)
+
+class MethodNode:
+    def __init__(self, func_name, body, lineno, fn):
+        self.func_name = func_name
+        self.body = body
+        self.fn = fn
+        self.lineno = lineno
+
+    def eval(self, data):
+        if self.func_name == "__anonymous":
+            funcname = ("__anon_%s_%s" % (self.lineno, self.fn.translate(string.maketrans('/.+-', '____'))))
+            if not funcname in bb.methodpool._parsed_fns:
+                text = "def %s(d):\n" % (funcname) + '\n'.join(self.body)
+                bb.methodpool.insert_method(funcname, text, self.fn)
+            anonfuncs = bb.data.getVar('__BBANONFUNCS', data) or []
+            anonfuncs.append(funcname)
+            bb.data.setVar('__BBANONFUNCS', anonfuncs, data)
+        else:
+            bb.data.setVarFlag(self.func_name, "func", 1, data)
+            bb.data.setVar(self.func_name, '\n'.join(self.body), data)
+
+class PythonMethodNode(AstNode):
+    def __init__(self, root, body, fn):
+        self.root = root
+        self.body = body
+        self.fn = fn
+
+    def eval(self, data):
+        # Note we will add root to parsedmethods after having parse
+        # 'this' file. This means we will not parse methods from
+        # bb classes twice
+        if not self.root  in __parsed_methods__:
+            text = '\n'.join(self.body)
+            bb.methodpool.insert_method(self.root, text, self.fn)
+
+class MethodFlagsNode(AstNode):
+    def __init__(self, key, m):
+        self.key = key
+        self.m = m
+
+    def eval(self, data):
+        if bb.data.getVar(self.key, data):
+            # clean up old version of this piece of metadata, as its
+            # flags could cause problems
+            bb.data.setVarFlag(self.key, 'python', None, data)
+            bb.data.setVarFlag(self.key, 'fakeroot', None, data)
+        if self.m.group("py") is not None:
+            bb.data.setVarFlag(self.key, "python", "1", data)
+        else:
+            bb.data.delVarFlag(self.key, "python", data)
+        if self.m.group("fr") is not None:
+            bb.data.setVarFlag(self.key, "fakeroot", "1", data)
+        else:
+            bb.data.delVarFlag(self.key, "fakeroot", data)
+
+class ExportFuncsNode(AstNode):
+    def __init__(self, fns, classes):
+        self.n = __word__.findall(fns)
+        self.classes = classes
+
+    def eval(self, data):
+        for f in self.n:
+            allvars = []
+            allvars.append(f)
+            allvars.append(self.classes[-1] + "_" + f)
+
+            vars = [[ allvars[0], allvars[1] ]]
+            if len(self.classes) > 1 and self.classes[-2] is not None:
+                allvars.append(self.classes[-2] + "_" + f)
+                vars = []
+                vars.append([allvars[2], allvars[1]])
+                vars.append([allvars[0], allvars[2]])
+
+            for (var, calledvar) in vars:
+                if bb.data.getVar(var, data) and not bb.data.getVarFlag(var, 'export_func', data):
+                    continue
+
+                if bb.data.getVar(var, data):
+                    bb.data.setVarFlag(var, 'python', None, data)
+                    bb.data.setVarFlag(var, 'func', None, data)
+
+                for flag in [ "func", "python" ]:
+                    if bb.data.getVarFlag(calledvar, flag, data):
+                        bb.data.setVarFlag(var, flag, bb.data.getVarFlag(calledvar, flag, data), data)
+                for flag in [ "dirs" ]:
+                    if bb.data.getVarFlag(var, flag, data):
+                        bb.data.setVarFlag(calledvar, flag, bb.data.getVarFlag(var, flag, data), data)
+
+                if bb.data.getVarFlag(calledvar, "python", data):
+                    bb.data.setVar(var, "\tbb.build.exec_func('" + calledvar + "', d)\n", data)
+                else:
+                    bb.data.setVar(var, "\t" + calledvar + "\n", data)
+                bb.data.setVarFlag(var, 'export_func', '1', data)
+
+class AddTaskNode(AstNode):
+    def __init__(self, func, before, after):
+        self.func = func
+        self.before = before
+        self.after = after
+
+    def eval(self, data):
+        var = self.func
+        if self.func[:3] != "do_":
+            var = "do_" + self.func
+
+        bb.data.setVarFlag(var, "task", 1, data)
+        bbtasks = bb.data.getVar('__BBTASKS', data) or []
+        if not var in bbtasks:
+            bbtasks.append(var)
+        bb.data.setVar('__BBTASKS', bbtasks, data)
+
+        existing = bb.data.getVarFlag(var, "deps", data) or []
+        if self.after is not None:
+            # set up deps for function
+            for entry in self.after.split():
+                if entry not in existing:
+                    existing.append(entry)
+        bb.data.setVarFlag(var, "deps", existing, data)
+        if self.before is not None:
+            # set up things that depend on this func
+            for entry in self.before.split():
+                existing = bb.data.getVarFlag(entry, "deps", data) or []
+                if var not in existing:
+                    bb.data.setVarFlag(entry, "deps", [var] + existing, data)
+
+class BBHandlerNode(AstNode):
+    def __init__(self, fns):
+        self.hs = __word__.findall(fns)
+
+    def eval(self, data):
+        bbhands = bb.data.getVar('__BBHANDLERS', data) or []
+        for h in self.hs:
+            bbhands.append(h)
+            bb.data.setVarFlag(h, "handler", 1, data)
+        bb.data.setVar('__BBHANDLERS', bbhands, data)
+
+class InheritNode(AstNode):
+    def __init__(self, files):
+        self.n = __word__.findall(files)
+
+    def eval(self, data):
+        bb.parse.BBHandler.inherit(self.n, data)
+ 
+def handleInclude(statements, m, fn, lineno, force):
+    statements.append(IncludeNode(m.group(1), fn, lineno, force))
+
+def handleExport(statements, m):
+    statements.append(ExportNode(m.group(1)))
+
+def handleData(statements, groupd):
+    statements.append(DataNode(groupd))
+
+def handleMethod(statements, func_name, lineno, fn, body):
+    statements.append(MethodNode(func_name, body, lineno, fn))
+
+def handlePythonMethod(statements, root, body, fn):
+    statements.append(PythonMethodNode(root, body, fn))
+
+def handleMethodFlags(statements, key, m):
+    statements.append(MethodFlagsNode(key, m))
+
+def handleExportFuncs(statements, m, classes):
+    statements.append(ExportFuncsNode(m.group(1), classes))
+
+def handleAddTask(statements, m):
+    func = m.group("func")
+    before = m.group("before")
+    after = m.group("after")
+    if func is None:
+        return
+
+    statements.append(AddTaskNode(func, before, after))
+
+def handleBBHandlers(statements, m):
+    statements.append(BBHandlerNode(m.group(1)))
+
+def handleInherit(statements, m):
+    files = m.group(1)
+    n = __word__.findall(files)
+    statements.append(InheritNode(m.group(1)))
+
+def finalise(fn, d):
+    for lazykey in bb.data.getVar("__lazy_assigned", d) or ():
+        if bb.data.getVar(lazykey, d) is None:
+            val = bb.data.getVarFlag(lazykey, "defaultval", d)
+            bb.data.setVar(lazykey, val, d)
+
+    bb.data.expandKeys(d)
+    bb.data.update_data(d)
+    anonqueue = bb.data.getVar("__anonqueue", d, 1) or []
+    body = [x['content'] for x in anonqueue]
+    flag = { 'python' : 1, 'func' : 1 }
+    bb.data.setVar("__anonfunc", "\n".join(body), d)
+    bb.data.setVarFlags("__anonfunc", flag, d)
+    from bb import build
+    try:
+        t = bb.data.getVar('T', d)
+        bb.data.setVar('T', '${TMPDIR}/anonfunc/', d)
+        anonfuncs = bb.data.getVar('__BBANONFUNCS', d) or []
+        code = ""
+        for f in anonfuncs:
+            code = code + "    %s(d)\n" % f
+        bb.data.setVar("__anonfunc", code, d)        
+        build.exec_func("__anonfunc", d)
+        bb.data.delVar('T', d)
+        if t:
+            bb.data.setVar('T', t, d)
+    except Exception, e:
+        bb.msg.debug(1, bb.msg.domain.Parsing, "Exception when executing anonymous function: %s" % e)
+        raise
+    bb.data.delVar("__anonqueue", d)
+    bb.data.delVar("__anonfunc", d)
+    bb.data.update_data(d)
+
+    all_handlers = {} 
+    for var in bb.data.getVar('__BBHANDLERS', d) or []:
+        # try to add the handler
+        handler = bb.data.getVar(var,d)
+        bb.event.register(var, handler)
+
+    tasklist = bb.data.getVar('__BBTASKS', d) or []
+    bb.build.add_tasks(tasklist, d)
+
+    bb.event.fire(bb.event.RecipeParsed(fn), d)
+
+def _create_variants(datastores, names, function):
+    def create_variant(name, orig_d, arg = None):
+        new_d = bb.data.createCopy(orig_d)
+        function(arg or name, new_d)
+        datastores[name] = new_d
+
+    for variant, variant_d in datastores.items():
+        for name in names:
+            if not variant:
+                # Based on main recipe
+                create_variant(name, variant_d)
+            else:
+                create_variant("%s-%s" % (variant, name), variant_d, name)
+
+def _expand_versions(versions):
+    def expand_one(version, start, end):
+        for i in xrange(start, end + 1):
+            ver = _bbversions_re.sub(str(i), version, 1)
+            yield ver
+
+    versions = iter(versions)
+    while True:
+        try:
+            version = versions.next()
+        except StopIteration:
+            break
+
+        range_ver = _bbversions_re.search(version)
+        if not range_ver:
+            yield version
+        else:
+            newversions = expand_one(version, int(range_ver.group("from")),
+                                     int(range_ver.group("to")))
+            versions = chain(newversions, versions)
+
+def multi_finalize(fn, d):
+    safe_d = d
+
+    d = bb.data.createCopy(safe_d)
+    try:
+        finalise(fn, d)
+    except bb.parse.SkipPackage:
+        bb.data.setVar("__SKIPPED", True, d)
+    datastores = {"": safe_d}
+
+    versions = (d.getVar("BBVERSIONS", True) or "").split()
+    if versions:
+        pv = orig_pv = d.getVar("PV", True)
+        baseversions = {}
+
+        def verfunc(ver, d, pv_d = None):
+            if pv_d is None:
+                pv_d = d
+
+            overrides = d.getVar("OVERRIDES", True).split(":")
+            pv_d.setVar("PV", ver)
+            overrides.append(ver)
+            bpv = baseversions.get(ver) or orig_pv
+            pv_d.setVar("BPV", bpv)
+            overrides.append(bpv)
+            d.setVar("OVERRIDES", ":".join(overrides))
+
+        versions = list(_expand_versions(versions))
+        for pos, version in enumerate(list(versions)):
+            try:
+                pv, bpv = version.split(":", 2)
+            except ValueError:
+                pass
+            else:
+                versions[pos] = pv
+                baseversions[pv] = bpv
+
+        if pv in versions and not baseversions.get(pv):
+            versions.remove(pv)
+        else:
+            pv = versions.pop()
+
+            # This is necessary because our existing main datastore
+            # has already been finalized with the old PV, we need one
+            # that's been finalized with the new PV.
+            d = bb.data.createCopy(safe_d)
+            verfunc(pv, d, safe_d)
+            try:
+                finalise(fn, d)
+            except bb.parse.SkipPackage:
+                bb.data.setVar("__SKIPPED", True, d)
+
+        _create_variants(datastores, versions, verfunc)
+
+    extended = d.getVar("BBCLASSEXTEND", True) or ""
+    if extended:
+        pn = d.getVar("PN", True)
+        def extendfunc(name, d):
+            d.setVar("PN", "%s-%s" % (pn, name))
+            bb.parse.BBHandler.inherit([name], d)
+
+        safe_d.setVar("BBCLASSEXTEND", extended)
+        _create_variants(datastores, extended.split(), extendfunc)
+
+    for variant, variant_d in datastores.items():
+        if variant:
+            try:
+                finalise(fn, variant_d)
+            except bb.parse.SkipPackage:
+                bb.data.setVar("__SKIPPED", True, variant_d)
+
+    if len(datastores) > 1:
+        variants = filter(None, datastores.keys())
+        safe_d.setVar("__VARIANTS", " ".join(variants))
+
+    datastores[""] = d
+    return datastores
--- a/bitbake/lib/bb/parse/parse_py/BBHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py
@@ -25,12 +25,15 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

-import re, bb, os, sys, time
+import re, bb, os, sys, time, string
 import bb.fetch, bb.build, bb.utils
-from bb import data, fetch, methodpool
+from bb import data, fetch

-from ConfHandler import include, localpath, obtain, init
-from bb.parse import ParseError
+from ConfHandler import include, init
+from bb.parse import ParseError, resolve_file, ast
+
+# For compatibility
+from bb.parse import vars_from_file

 __func_start_regexp__    = re.compile( r"(((?P<py>python)|(?P<fr>fakeroot))\s*)*(?P<func>[\w\.\-\+\{\}\$]+)?\s*\(\s*\)\s*{$" )
 __inherit_regexp__       = re.compile( r"inherit\s+(.+)" )
@@ -39,7 +42,7 @@ __addtask_regexp__       = re.compile("addtask\s+(?P<func>\w+)\s*((before\s*(?P<
 __addhandler_regexp__    = re.compile( r"addhandler\s+(.+)" )
 __def_regexp__           = re.compile( r"def\s+(\w+).*:" )
 __python_func_regexp__   = re.compile( r"(\s+.*)|(^$)" )
-__word__ = re.compile(r"\S+")
+

 __infunc__ = ""
 __inpython__ = False
@@ -47,6 +50,8 @@ __body__   = []
 __classname__ = ""
 classes = [ None, ]

+cached_statements = {}
+
 # We need to indicate EOF to the feeder. This code is so messy that
 # factoring it out to a close_parse_file method is out of question.
 # We will use the IN_PYTHON_EOF as an indicator to just close the method
@@ -54,11 +59,10 @@ classes = [ None, ]
 # The two parts using it are tightly integrated anyway
 IN_PYTHON_EOF = -9999999999999

-__parsed_methods__ = methodpool.get_parsed_dict()
+

 def supports(fn, d):
-    localfn = localpath(fn, d)
-    return localfn[-3:] == ".bb" or localfn[-8:] == ".bbclass" or localfn[-4:] == ".inc"
+    return fn[-3:] == ".bb" or fn[-8:] == ".bbclass" or fn[-4:] == ".inc"

 def inherit(files, d):
    __inherit_cache = data.getVar('__inherit_cache', d) or []
@@ -76,13 +80,38 @@ def inherit(files, d):
            include(fn, file, d, "inherit")
            __inherit_cache = data.getVar('__inherit_cache', d) or []

-def handle(fn, d, include = 0):
+def get_statements(filename, absolsute_filename, base_name):
+    global cached_statements
+
+    try:
+        return cached_statements[absolsute_filename]
+    except KeyError:
+        file = open(absolsute_filename, 'r')
+        statements = ast.StatementGroup()
+
+        lineno = 0
+        while 1:
+            lineno = lineno + 1
+            s = file.readline()
+            if not s: break
+            s = s.rstrip()
+            feeder(lineno, s, filename, base_name, statements)
+        if __inpython__:
+            # add a blank line to close out any python definition
+            feeder(IN_PYTHON_EOF, "", filename, base_name, statements)
+
+        if filename.endswith(".bbclass") or filename.endswith(".inc"):
+            cached_statements[absolsute_filename] = statements
+        return statements
+
+def handle(fn, d, include):
    global __func_start_regexp__, __inherit_regexp__, __export_func_regexp__, __addtask_regexp__, __addhandler_regexp__, __infunc__, __body__, __residue__
    __body__ = []
    __infunc__ = ""
    __classname__ = ""
    __residue__ = []

+
    if include == 0:
        bb.msg.debug(2, bb.msg.domain.Parsing, "BB " + fn + ": handle(data)")
    else:
@@ -95,135 +124,51 @@ def handle(fn, d, include = 0):
    if ext == ".bbclass":
        __classname__ = root
        classes.append(__classname__)
+        __inherit_cache = data.getVar('__inherit_cache', d) or []
+        if not fn in __inherit_cache:
+            __inherit_cache.append(fn)
+            data.setVar('__inherit_cache', __inherit_cache, d)

    if include != 0:
        oldfile = data.getVar('FILE', d)
    else:
        oldfile = None

-    fn = obtain(fn, d)
-    bbpath = (data.getVar('BBPATH', d, 1) or '').split(':')
-    if not os.path.isabs(fn):
-        f = None
-        for p in bbpath:
-            j = os.path.join(p, fn)
-            if os.access(j, os.R_OK):
-                abs_fn = j
-                f = open(j, 'r')
-                break
-        if f is None:
-            raise IOError("file not found")
-    else:
-        f = open(fn,'r')
-        abs_fn = fn
-
-    if ext != ".bbclass":
-        bbpath.insert(0, os.path.dirname(abs_fn))
-        data.setVar('BBPATH', ":".join(bbpath), d)
+    abs_fn = resolve_file(fn, d)

    if include:
        bb.parse.mark_dependency(d, abs_fn)

+    # actual loading
+    statements = get_statements(fn, abs_fn, base_name)
+
+    # DONE WITH PARSING... time to evaluate
    if ext != ".bbclass":
        data.setVar('FILE', fn, d)
-        i = (data.getVar("INHERIT", d, 1) or "").split()
-        if not "base" in i and __classname__ != "base":
-            i[0:0] = ["base"]
-        inherit(i, d)

-    lineno = 0
-    while 1:
-        lineno = lineno + 1
-        s = f.readline()
-        if not s: break
-        s = s.rstrip()
-        feeder(lineno, s, fn, base_name, d)
-    if __inpython__:
-        # add a blank line to close out any python definition
-        feeder(IN_PYTHON_EOF, "", fn, base_name, d)
+    statements.eval(d)
+
    if ext == ".bbclass":
        classes.remove(__classname__)
    else:
        if include == 0:
-            data.expandKeys(d)
-            data.update_data(d)
-            anonqueue = data.getVar("__anonqueue", d, 1) or []
-            body = [x['content'] for x in anonqueue]
-            flag = { 'python' : 1, 'func' : 1 }
-            data.setVar("__anonfunc", "\n".join(body), d)
-            data.setVarFlags("__anonfunc", flag, d)
-            from bb import build
-            try:
-                t = data.getVar('T', d)
-                data.setVar('T', '${TMPDIR}/', d)
-                build.exec_func("__anonfunc", d)
-                data.delVar('T', d)
-                if t:
-                    data.setVar('T', t, d)
-            except Exception, e:
-                bb.msg.debug(1, bb.msg.domain.Parsing, "Exception when executing anonymous function: %s" % e)
-                raise
-            data.delVar("__anonqueue", d)
-            data.delVar("__anonfunc", d)
-            set_additional_vars(fn, d, include)
-            data.update_data(d)
+            return ast.multi_finalize(fn, d)

-            all_handlers = {} 
-            for var in data.getVar('__BBHANDLERS', d) or []:
-                # try to add the handler
-                # if we added it remember the choiche
-                handler = data.getVar(var,d)
-                if bb.event.register(var,handler) == bb.event.Registered:
-                    all_handlers[var] = handler
-
-            tasklist = {}
-            for var in data.getVar('__BBTASKS', d) or []:
-                if var not in tasklist:
-                    tasklist[var] = []
-                deps = data.getVarFlag(var, 'deps', d) or []
-                for p in deps:
-                    if p not in tasklist[var]:
-                        tasklist[var].append(p)
-
-                postdeps = data.getVarFlag(var, 'postdeps', d) or []
-                for p in postdeps:
-                    if p not in tasklist:
-                        tasklist[p] = []
-                    if var not in tasklist[p]:
-                        tasklist[p].append(var)
-
-            bb.build.add_tasks(tasklist, d)
-
-            # now add the handlers
-            if not len(all_handlers) == 0:
-                data.setVar('__all_handlers__', all_handlers, d)
-
-        bbpath.pop(0)
    if oldfile:
        bb.data.setVar("FILE", oldfile, d)

    # we have parsed the bb class now
    if ext == ".bbclass" or ext == ".inc":
-        __parsed_methods__[base_name] = 1
+        bb.methodpool.get_parsed_dict()[base_name] = 1

    return d

-def feeder(lineno, s, fn, root, d):
+def feeder(lineno, s, fn, root, statements):
    global __func_start_regexp__, __inherit_regexp__, __export_func_regexp__, __addtask_regexp__, __addhandler_regexp__, __def_regexp__, __python_func_regexp__, __inpython__,__infunc__, __body__, classes, bb, __residue__
    if __infunc__:
        if s == '}':
            __body__.append('')
-            data.setVar(__infunc__, '\n'.join(__body__), d)
-            data.setVarFlag(__infunc__, "func", 1, d)
-            if __infunc__ == "__anonymous":
-                anonqueue = bb.data.getVar("__anonqueue", d) or []
-                anonitem = {}
-                anonitem["content"] = bb.data.getVar("__anonymous", d)
-                anonitem["flags"] = bb.data.getVarFlags("__anonymous", d)
-                anonqueue.append(anonitem)
-                bb.data.setVar("__anonqueue", anonqueue, d)
-                bb.data.delVarFlags("__anonymous", d)
-                bb.data.delVar("__anonymous", d)
+            ast.handleMethod(statements, __infunc__, lineno, fn, __body__)
            __infunc__ = ""
            __body__ = []
        else:
@@ -236,19 +181,7 @@ def feeder(lineno, s, fn, root, d):
            __body__.append(s)
            return
        else:
-            # Note we will add root to parsedmethods after having parse
-            # 'this' file. This means we will not parse methods from
-            # bb classes twice
-            if not root  in __parsed_methods__:
-                text = '\n'.join(__body__)
-                methodpool.insert_method( root, text, fn )
-                funcs = data.getVar('__functions__', d) or {}
-                if not funcs.has_key( root ):
-                    funcs[root] = text 
-                else:
-                    funcs[root] = "%s\n%s" % (funcs[root], text)
-
-                data.setVar('__functions__', funcs, d)
+            ast.handlePythonMethod(statements, root, __body__, fn)
            __body__ = []
            __inpython__ = False

@@ -269,20 +202,7 @@ def feeder(lineno, s, fn, root, d):
    m = __func_start_regexp__.match(s)
    if m:
        __infunc__ = m.group("func") or "__anonymous"
-        key = __infunc__
-        if data.getVar(key, d):
-#           clean up old version of this piece of metadata, as its
-#           flags could cause problems
-            data.setVarFlag(key, 'python', None, d)
-            data.setVarFlag(key, 'fakeroot', None, d)
-        if m.group("py") is not None:
-            data.setVarFlag(key, "python", "1", d)
-        else:
-            data.delVarFlag(key, "python", d)
-        if m.group("fr") is not None:
-            data.setVarFlag(key, "fakeroot", "1", d)
-        else:
-            data.delVarFlag(key, "fakeroot", d)
+        ast.handleMethodFlags(statements, __infunc__, m)
        return

    m = __def_regexp__.match(s)
@@ -293,133 +213,26 @@ def feeder(lineno, s, fn, root, d):

    m = __export_func_regexp__.match(s)
    if m:
-        fns = m.group(1)
-        n = __word__.findall(fns)
-        for f in n:
-            allvars = []
-            allvars.append(f)
-            allvars.append(classes[-1] + "_" + f)
-
-            vars = [[ allvars[0], allvars[1] ]]
-            if len(classes) > 1 and classes[-2] is not None:
-                allvars.append(classes[-2] + "_" + f)
-                vars = []
-                vars.append([allvars[2], allvars[1]])
-                vars.append([allvars[0], allvars[2]])
-
-            for (var, calledvar) in vars:
-                if data.getVar(var, d) and not data.getVarFlag(var, 'export_func', d):
-                    continue
-
-                if data.getVar(var, d):
-                    data.setVarFlag(var, 'python', None, d)
-                    data.setVarFlag(var, 'func', None, d)
-
-                for flag in [ "func", "python" ]:
-                    if data.getVarFlag(calledvar, flag, d):
-                        data.setVarFlag(var, flag, data.getVarFlag(calledvar, flag, d), d)
-                for flag in [ "dirs" ]:
-                    if data.getVarFlag(var, flag, d):
-                        data.setVarFlag(calledvar, flag, data.getVarFlag(var, flag, d), d)
-
-                if data.getVarFlag(calledvar, "python", d):
-                    data.setVar(var, "\tbb.build.exec_func('" + calledvar + "', d)\n", d)
-                else:
-                    data.setVar(var, "\t" + calledvar + "\n", d)
-                data.setVarFlag(var, 'export_func', '1', d)
-
+        ast.handleExportFuncs(statements, m, classes)
        return

    m = __addtask_regexp__.match(s)
    if m:
-        func = m.group("func")
-        before = m.group("before")
-        after = m.group("after")
-        if func is None:
-            return
-        var = "do_" + func
-
-        data.setVarFlag(var, "task", 1, d)
-
-        bbtasks = data.getVar('__BBTASKS', d) or []
-        bbtasks.append(var)
-        data.setVar('__BBTASKS', bbtasks, d)
-
-        if after is not None:
-#           set up deps for function
-            data.setVarFlag(var, "deps", after.split(), d)
-        if before is not None:
-#           set up things that depend on this func
-            data.setVarFlag(var, "postdeps", before.split(), d)
+        ast.handleAddTask(statements, m)
        return

    m = __addhandler_regexp__.match(s)
    if m:
-        fns = m.group(1)
-        hs = __word__.findall(fns)
-        bbhands = data.getVar('__BBHANDLERS', d) or []
-        for h in hs:
-            bbhands.append(h)
-            data.setVarFlag(h, "handler", 1, d)
-        data.setVar('__BBHANDLERS', bbhands, d)
+        ast.handleBBHandlers(statements, m)
        return

    m = __inherit_regexp__.match(s)
    if m:
-
-        files = m.group(1)
-        n = __word__.findall(files)
-        inherit(n, d)
+        ast.handleInherit(statements, m)
        return

    from bb.parse import ConfHandler
-    return ConfHandler.feeder(lineno, s, fn, d)
-
-__pkgsplit_cache__={}
-def vars_from_file(mypkg, d):
-    if not mypkg:
-        return (None, None, None)
-    if mypkg in __pkgsplit_cache__:
-        return __pkgsplit_cache__[mypkg]
-
-    myfile = os.path.splitext(os.path.basename(mypkg))
-    parts = myfile[0].split('_')
-    __pkgsplit_cache__[mypkg] = parts
-    if len(parts) > 3:
-        raise ParseError("Unable to generate default variables from the filename: %s (too many underscores)" % mypkg)
-    exp = 3 - len(parts)
-    tmplist = []
-    while exp != 0:
-        exp -= 1
-        tmplist.append(None)
-    parts.extend(tmplist)
-    return parts
-
-def set_additional_vars(file, d, include):
-    """Deduce rest of variables, e.g. ${A} out of ${SRC_URI}"""
-
-    return
-    # Nothing seems to use this variable
-    #bb.msg.debug(2, bb.msg.domain.Parsing, "BB %s: set_additional_vars" % file)
-
-    #src_uri = data.getVar('SRC_URI', d, 1)
-    #if not src_uri:
-    #    return
-
-    #a = (data.getVar('A', d, 1) or '').split()
-
-    #from bb import fetch
-    #try:
-    #    ud = fetch.init(src_uri.split(), d)
-    #    a += fetch.localpaths(d, ud)
-    #except fetch.NoMethodError:
-    #    pass
-    #except bb.MalformedUrl,e:
-    #    raise ParseError("Unable to generate local paths for SRC_URI due to malformed uri: %s" % e)
-    #del fetch
-
-    #data.setVar('A', " ".join(a), d)
-
+    return ConfHandler.feeder(lineno, s, fn, statements)

 # Add us to the handlers list
 from bb.parse import handlers
--- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
@@ -25,70 +25,25 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 import re, bb.data, os, sys
-from bb.parse import ParseError
+from bb.parse import ParseError, resolve_file, ast

 #__config_regexp__  = re.compile( r"(?P<exp>export\s*)?(?P<var>[a-zA-Z0-9\-_+.${}]+)\s*(?P<colon>:)?(?P<ques>\?)?=\s*(?P<apo>['\"]?)(?P<value>.*)(?P=apo)$")
-__config_regexp__  = re.compile( r"(?P<exp>export\s*)?(?P<var>[a-zA-Z0-9\-_+.${}/]+)(\[(?P<flag>[a-zA-Z0-9\-_+.]+)\])?\s*((?P<colon>:=)|(?P<ques>\?=)|(?P<append>\+=)|(?P<prepend>=\+)|(?P<predot>=\.)|(?P<postdot>\.=)|=)\s*(?P<apo>['\"]?)(?P<value>.*)(?P=apo)$")
+__config_regexp__  = re.compile( r"(?P<exp>export\s*)?(?P<var>[a-zA-Z0-9\-_+.${}/]+)(\[(?P<flag>[a-zA-Z0-9\-_+.]+)\])?\s*((?P<colon>:=)|(?P<lazyques>\?\?=)|(?P<ques>\?=)|(?P<append>\+=)|(?P<prepend>=\+)|(?P<predot>=\.)|(?P<postdot>\.=)|=)\s*(?P<apo>['\"]?)(?P<value>.*)(?P=apo)$")
 __include_regexp__ = re.compile( r"include\s+(.+)" )
 __require_regexp__ = re.compile( r"require\s+(.+)" )
 __export_regexp__ = re.compile( r"export\s+(.+)" )

 def init(data):
-    if not bb.data.getVar('TOPDIR', data):
-        bb.data.setVar('TOPDIR', os.getcwd(), data)
+    topdir = bb.data.getVar('TOPDIR', data)
+    if not topdir:
+        topdir = os.getcwd()
+        bb.data.setVar('TOPDIR', topdir, data)
    if not bb.data.getVar('BBPATH', data):
-        bb.data.setVar('BBPATH', os.path.join(sys.prefix, 'share', 'bitbake'), data)
+        bb.fatal("The BBPATH environment variable must be set")
+

 def supports(fn, d):
-    return localpath(fn, d)[-5:] == ".conf"
-
-def localpath(fn, d):
-    if os.path.exists(fn):
-        return fn
-
-    if "://" not in fn:
-        return fn
-
-    localfn = None
-    try:
-        localfn = bb.fetch.localpath(fn, d, False)
-    except bb.MalformedUrl:
-        pass
-
-    if not localfn:
-        return fn
-    return localfn
-
-def obtain(fn, data):
-    import sys, bb
-    fn = bb.data.expand(fn, data)
-    localfn = bb.data.expand(localpath(fn, data), data)
-
-    if localfn != fn:
-        dldir = bb.data.getVar('DL_DIR', data, 1)
-        if not dldir:
-            bb.msg.debug(1, bb.msg.domain.Parsing, "obtain: DL_DIR not defined")
-            return localfn
-        bb.mkdirhier(dldir)
-        try:
-            bb.fetch.init([fn], data)
-        except bb.fetch.NoMethodError:
-            (type, value, traceback) = sys.exc_info()
-            bb.msg.debug(1, bb.msg.domain.Parsing, "obtain: no method: %s" % value)
-            return localfn
-
-        try:
-            bb.fetch.go(data)
-        except bb.fetch.MissingParameterError:
-            (type, value, traceback) = sys.exc_info()
-            bb.msg.debug(1, bb.msg.domain.Parsing, "obtain: missing parameters: %s" % value)
-            return localfn
-        except bb.fetch.FetchError:
-            (type, value, traceback) = sys.exc_info()
-            bb.msg.debug(1, bb.msg.domain.Parsing, "obtain: failed: %s" % value)
-            return localfn
-    return localfn
-
+    return fn[-5:] == ".conf"

 def include(oldfn, fn, data, error_out):
    """
@@ -102,6 +57,13 @@ def include(oldfn, fn, data, error_out):
    fn = bb.data.expand(fn, data)
    oldfn = bb.data.expand(oldfn, data)

+    if not os.path.isabs(fn):
+        dname = os.path.dirname(oldfn)
+        bbpath = "%s:%s" % (dname, bb.data.getVar("BBPATH", data, 1))
+        abs_fn = bb.which(bbpath, fn)
+        if abs_fn:
+            fn = abs_fn
+
    from bb.parse import handle
    try:
        ret = handle(fn, data, True)
@@ -110,42 +72,22 @@ def include(oldfn, fn, data, error_out):
            raise ParseError("Could not %(error_out)s file %(fn)s" % vars() )
        bb.msg.debug(2, bb.msg.domain.Parsing, "CONF file '%s' not found" % fn)

-def handle(fn, data, include = 0):
-    if include:
-        inc_string = "including"
-    else:
-        inc_string = "reading"
+def handle(fn, data, include):
    init(data)

    if include == 0:
-        bb.data.inheritFromOS(data)
        oldfile = None
    else:
        oldfile = bb.data.getVar('FILE', data)

-    fn = obtain(fn, data)
-    if not os.path.isabs(fn):
-        f = None
-        bbpath = bb.data.getVar("BBPATH", data, 1) or []
-        for p in bbpath.split(":"):
-            currname = os.path.join(p, fn)
-            if os.access(currname, os.R_OK):
-                f = open(currname, 'r')
-                abs_fn = currname
-                bb.msg.debug(2, bb.msg.domain.Parsing, "CONF %s %s" % (inc_string, currname))
-                break
-        if f is None:
-            raise IOError("file '%s' not found" % fn)
-    else:
-        f = open(fn,'r')
-        bb.msg.debug(1, bb.msg.domain.Parsing, "CONF %s %s" % (inc_string,fn))
-        abs_fn = fn
+    abs_fn = resolve_file(fn, data)
+    f = open(abs_fn, 'r')

    if include:
        bb.parse.mark_dependency(data, abs_fn)

+    statements = ast.StatementGroup()
    lineno = 0
-    bb.data.setVar('FILE', fn, data)
    while 1:
        lineno = lineno + 1
        s = f.readline()
@@ -158,66 +100,36 @@ def handle(fn, data, include = 0):
            s2 = f.readline()[:-1].strip()
            lineno = lineno + 1
            s = s[:-1] + s2
-        feeder(lineno, s, fn, data)
+        feeder(lineno, s, fn, statements)

+    # DONE WITH PARSING... time to evaluate
+    bb.data.setVar('FILE', fn, data)
+    statements.eval(data)
    if oldfile:
        bb.data.setVar('FILE', oldfile, data)
+
    return data

-def feeder(lineno, s, fn, data):
-    def getFunc(groupd, key, data):
-        if 'flag' in groupd and groupd['flag'] != None:
-            return bb.data.getVarFlag(key, groupd['flag'], data)
-        else:
-            return bb.data.getVar(key, data)
-
+def feeder(lineno, s, fn, statements):
    m = __config_regexp__.match(s)
    if m:
        groupd = m.groupdict()
-        key = groupd["var"]
-        if "exp" in groupd and groupd["exp"] != None:
-            bb.data.setVarFlag(key, "export", 1, data)
-        if "ques" in groupd and groupd["ques"] != None:
-            val = getFunc(groupd, key, data)
-            if val == None:
-                val = groupd["value"]
-        elif "colon" in groupd and groupd["colon"] != None:
-            e = data.createCopy()
-            bb.data.update_data(e)
-            val = bb.data.expand(groupd["value"], e)
-        elif "append" in groupd and groupd["append"] != None:
-            val = "%s %s" % ((getFunc(groupd, key, data) or ""), groupd["value"])
-        elif "prepend" in groupd and groupd["prepend"] != None:
-            val = "%s %s" % (groupd["value"], (getFunc(groupd, key, data) or ""))
-        elif "postdot" in groupd and groupd["postdot"] != None:
-            val = "%s%s" % ((getFunc(groupd, key, data) or ""), groupd["value"])
-        elif "predot" in groupd and groupd["predot"] != None:
-            val = "%s%s" % (groupd["value"], (getFunc(groupd, key, data) or ""))
-        else:
-            val = groupd["value"]
-        if 'flag' in groupd and groupd['flag'] != None:
-            bb.msg.debug(3, bb.msg.domain.Parsing, "setVarFlag(%s, %s, %s, data)" % (key, groupd['flag'], val))
-            bb.data.setVarFlag(key, groupd['flag'], val, data)
-        else:
-            bb.data.setVar(key, val, data)
+        ast.handleData(statements, groupd)
        return

    m = __include_regexp__.match(s)
    if m:
-        s = bb.data.expand(m.group(1), data)
-        bb.msg.debug(3, bb.msg.domain.Parsing, "CONF %s:%d: including %s" % (fn, lineno, s))
-        include(fn, s, data, False)
+        ast.handleInclude(statements, m, fn, lineno, False)
        return

    m = __require_regexp__.match(s)
    if m:
-        s = bb.data.expand(m.group(1), data)
-        include(fn, s, data, "include required")
+        ast.handleInclude(statements, m, fn, lineno, True)
        return

    m = __export_regexp__.match(s)
    if m:
-        bb.data.setVarFlag(m.group(1), "export", 1, data)
+        ast.handleExport(statements, m)
        return

    raise ParseError("%s:%d: unparsed line: '%s'" % (fn, lineno, s));
--- a/bitbake/lib/bb/persist_data.py
+++ b/bitbake/lib/bb/persist_data.py
@@ -43,9 +43,9 @@ class PersistData:
    Why sqlite? It handles all the locking issues for us.
    """
    def __init__(self, d):
-        self.cachedir = bb.data.getVar("CACHE", d, True)
+        self.cachedir = bb.data.getVar("PERSISTENT_DIR", d, True) or bb.data.getVar("CACHE", d, True)
        if self.cachedir in [None, '']:
-            bb.msg.fatal(bb.msg.domain.PersistData, "Please set the 'CACHE' variable.")
+            bb.msg.fatal(bb.msg.domain.PersistData, "Please set the 'PERSISTENT_DIR' or 'CACHE' variable.")
        try:
            os.stat(self.cachedir)
        except OSError:
@@ -69,6 +69,17 @@ class PersistData:
        """
        self.connection.execute("DROP TABLE IF EXISTS %s;" % domain)

+    def getKeyValues(self, domain):
+        """
+        Return a list of key + value pairs for a domain
+        """
+        ret = {}
+        data = self.connection.execute("SELECT key, value from %s;" % domain)
+        for row in data:
+            ret[str(row[0])] = str(row[1])
+
+	return ret
+
    def getValue(self, domain, key):
        """
        Return the value of a key for a domain
--- a/bitbake/lib/bb/providers.py
+++ b/bitbake/lib/bb/providers.py
@@ -21,7 +21,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

-import os, re
+import re
 from bb import data, utils
 import bb

@@ -50,19 +50,27 @@ def sortPriorities(pn, dataCache, pkg_pn = None):
        if preference not in priorities[priority]:
            priorities[priority][preference] = []
        priorities[priority][preference].append(f)
-    pri_list = priorities.keys()
-    pri_list.sort(lambda a, b: a - b)
    tmp_pn = []
-    for pri in pri_list:
-        pref_list = priorities[pri].keys()
-        pref_list.sort(lambda a, b: b - a)
+    for pri in sorted(priorities, lambda a, b: a - b):
        tmp_pref = []
-        for pref in pref_list:
+        for pref in sorted(priorities[pri], lambda a, b: b - a):
            tmp_pref.extend(priorities[pri][pref])
        tmp_pn = [tmp_pref] + tmp_pn

    return tmp_pn

+def preferredVersionMatch(pe, pv, pr, preferred_e, preferred_v, preferred_r):
+    """
+    Check if the version pe,pv,pr is the preferred one.
+    If there is preferred version defined and ends with '%', then pv has to start with that version after removing the '%' 
+    """
+    if (pr == preferred_r or preferred_r == None):
+        if (pe == preferred_e or preferred_e == None):
+            if preferred_v == pv:
+                return True
+            if preferred_v != None and preferred_v.endswith('%') and pv.startswith(preferred_v[:len(preferred_v)-1]):
+                return True
+    return False

 def findPreferredProvider(pn, cfgData, dataCache, pkg_pn = None, item = None):
    """
@@ -96,7 +104,7 @@ def findPreferredProvider(pn, cfgData, dataCache, pkg_pn = None, item = None):
        for file_set in pkg_pn:
            for f in file_set:
                pe,pv,pr = dataCache.pkg_pepvpr[f]
-                if preferred_v == pv and (preferred_r == pr or preferred_r == None) and (preferred_e == pe or preferred_e == None):
+                if preferredVersionMatch(pe, pv, pr, preferred_e, preferred_v, preferred_r):
                    preferred_file = f
                    preferred_ver = (pe, pv, pr)
                    break
@@ -184,14 +192,14 @@ def _filterProviders(providers, item, cfgData, dataCache):
    bb.msg.debug(1, bb.msg.domain.Provider, "providers for %s are: %s" % (item, pkg_pn.keys()))

    # First add PREFERRED_VERSIONS
-    for pn in pkg_pn.keys():
+    for pn in pkg_pn:
        sortpkg_pn[pn] = sortPriorities(pn, dataCache, pkg_pn)
        preferred_versions[pn] = findPreferredProvider(pn, cfgData, dataCache, sortpkg_pn[pn], item)
        if preferred_versions[pn][1]:
            eligible.append(preferred_versions[pn][1])

    # Now add latest verisons
-    for pn in pkg_pn.keys():
+    for pn in sortpkg_pn:
        if pn in preferred_versions and preferred_versions[pn][1]:
            continue
        preferred_versions[pn] = findLatestProvider(pn, cfgData, dataCache, sortpkg_pn[pn][0])
@@ -213,34 +221,6 @@ def _filterProviders(providers, item, cfgData, dataCache):
        eligible.remove(fn)
        eligible = [fn] + eligible

-    # look to see if one of them is already staged, or marked as preferred.
-    # if so, bump it to the head of the queue
-    for p in providers:
-        pn = dataCache.pkg_fn[p]
-        pe, pv, pr = dataCache.pkg_pepvpr[p]
-
-        stamp = '%s.do_populate_staging' % dataCache.stamp[p]
-        if os.path.exists(stamp):
-            (newvers, fn) = preferred_versions[pn]
-            if not fn in eligible:
-                # package was made ineligible by already-failed check
-                continue
-            oldver = "%s-%s" % (pv, pr)
-            if pe > 0:
-                oldver = "%s:%s" % (pe, oldver)
-            newver = "%s-%s" % (newvers[1], newvers[2])
-            if newvers[0] > 0:
-                newver = "%s:%s" % (newvers[0], newver)
-            if (newver != oldver):
-                extra_chat = "%s (%s) already staged but upgrading to %s to satisfy %s" % (pn, oldver, newver, item)
-            else:
-                extra_chat = "Selecting already-staged %s (%s) to satisfy %s" % (pn, oldver, item)
-
-            bb.msg.note(2, bb.msg.domain.Provider, "%s" % extra_chat)
-            eligible.remove(fn)
-            eligible = [fn] + eligible
-            break
-
    return eligible


@@ -283,13 +263,17 @@ def filterProvidersRunTime(providers, item, cfgData, dataCache):

    # Should use dataCache.preferred here?
    preferred = []
+    preferred_vars = []
    for p in eligible:
        pn = dataCache.pkg_fn[p]
        provides = dataCache.pn_provides[pn]
        for provide in provides:
+            bb.msg.note(2, bb.msg.domain.Provider, "checking PREFERRED_PROVIDER_%s" % (provide))
            prefervar = bb.data.getVar('PREFERRED_PROVIDER_%s' % provide, cfgData, 1)
            if prefervar == pn:
-                bb.msg.note(2, bb.msg.domain.Provider, "selecting %s to satisfy runtime %s due to PREFERRED_PROVIDERS" % (pn, item))
+                var = "PREFERRED_PROVIDER_%s = %s" % (provide, prefervar)
+                bb.msg.note(2, bb.msg.domain.Provider, "selecting %s to satisfy runtime %s due to %s" % (pn, item, var))
+                preferred_vars.append(var)
                eligible.remove(p)
                eligible = [p] + eligible
                preferred.append(p)
@@ -297,10 +281,15 @@ def filterProvidersRunTime(providers, item, cfgData, dataCache):

    numberPreferred = len(preferred)

+    if numberPreferred > 1:
+        bb.msg.error(bb.msg.domain.Provider, "Conflicting PREFERRED_PROVIDER entries were found which resulted in an attempt to select multiple providers (%s) for runtime dependecy %s\nThe entries resulting in this conflict were: %s" % (preferred, item, preferred_vars))
+
    bb.msg.debug(1, bb.msg.domain.Provider, "sorted providers for %s are: %s" % (item, eligible))

    return eligible, numberPreferred

+regexp_cache = {}
+
 def getRuntimeProviders(dataCache, rdepend):
    """
    Return any providers of runtime dependency
@@ -318,7 +307,16 @@ def getRuntimeProviders(dataCache, rdepend):

    # Only search dynamic packages if we can't find anything in other variables
    for pattern in dataCache.packages_dynamic:
-        regexp = re.compile(pattern)
+        pattern = pattern.replace('+', "\+")
+        if pattern in regexp_cache:
+            regexp = regexp_cache[pattern]
+        else:
+            try:
+                regexp = re.compile(pattern)
+            except:
+                bb.msg.error(bb.msg.domain.Provider, "Error parsing re expression: %s" % pattern)
+                raise
+            regexp_cache[pattern] = regexp
        if regexp.match(rdepend):
            rproviders += dataCache.packages_dynamic[pattern]

--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
--- a/meta/packages/ipkg/ipkg-collateral/src
+++ b/meta/packages/ipkg/ipkg-collateral/src
--- a/bitbake/lib/bb/server/none.py
+++ b/bitbake/lib/bb/server/none.py
@@ -0,0 +1,181 @@
+#
+# BitBake 'dummy' Passthrough Server
+#
+# Copyright (C) 2006 - 2007  Michael 'Mickey' Lauer
+# Copyright (C) 2006 - 2008  Richard Purdie
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+"""
+    This module implements an xmlrpc server for BitBake.
+
+    Use this by deriving a class from BitBakeXMLRPCServer and then adding
+    methods which you want to "export" via XMLRPC. If the methods have the
+    prefix xmlrpc_, then registering those function will happen automatically,
+    if not, you need to call register_function.
+
+    Use register_idle_function() to add a function which the xmlrpc server
+    calls from within server_forever when no requests are pending. Make sure
+    that those functions are non-blocking or else you will introduce latency
+    in the server's main loop.
+"""
+
+import time
+import bb
+from bb.ui import uievent
+import xmlrpclib
+import pickle
+
+DEBUG = False
+
+from SimpleXMLRPCServer import SimpleXMLRPCServer, SimpleXMLRPCRequestHandler
+import inspect, select
+
+class BitBakeServerCommands():
+    def __init__(self, server, cooker):
+        self.cooker = cooker
+        self.server = server
+
+    def runCommand(self, command):
+        """
+        Run a cooker command on the server
+        """
+        #print "Running Command %s" % command
+        return self.cooker.command.runCommand(command)
+
+    def terminateServer(self):
+        """
+        Trigger the server to quit
+        """
+        self.server.server_exit()
+        #print "Server (cooker) exitting"
+        return
+
+    def ping(self):
+        """
+        Dummy method which can be used to check the server is still alive
+        """
+        return True
+
+eventQueue = []
+
+class BBUIEventQueue:
+    class event:
+        def __init__(self, parent):
+            self.parent = parent
+        @staticmethod
+        def send(event):
+            bb.server.none.eventQueue.append(pickle.loads(event))
+        @staticmethod
+        def quit():
+            return
+
+    def __init__(self, BBServer):
+        self.eventQueue = bb.server.none.eventQueue
+        self.BBServer = BBServer
+        self.EventHandle = bb.event.register_UIHhandler(self)
+
+    def getEvent(self):
+        if len(self.eventQueue) == 0:
+            return None
+
+        return self.eventQueue.pop(0)
+
+    def waitEvent(self, delay):
+        event = self.getEvent()
+        if event:
+            return event
+        self.BBServer.idle_commands(delay)
+        return self.getEvent()
+
+    def queue_event(self, event):
+        self.eventQueue.append(event)
+
+    def system_quit( self ):
+        bb.event.unregister_UIHhandler(self.EventHandle)
+
+class BitBakeServer():
+    # remove this when you're done with debugging
+    # allow_reuse_address = True
+
+    def __init__(self, cooker):
+        self._idlefuns = {}
+        self.commands = BitBakeServerCommands(self, cooker)
+
+    def register_idle_function(self, function, data):
+        """Register a function to be called while the server is idle"""
+        assert callable(function)
+        self._idlefuns[function] = data
+
+    def idle_commands(self, delay):
+        #print "Idle queue length %s" % len(self._idlefuns)
+        #print "Idle timeout, running idle functions"
+        #if len(self._idlefuns) == 0:
+        nextsleep = delay
+        for function, data in self._idlefuns.items():
+            try:
+                retval = function(self, data, False)
+                #print "Idle function returned %s" % (retval)
+                if retval is False:
+                    del self._idlefuns[function]
+                elif retval is True:
+                    nextsleep = None
+                elif nextsleep is None:
+                    continue
+                elif retval < nextsleep:
+                    nextsleep = retval
+            except SystemExit:
+                raise
+            except:
+                import traceback
+                traceback.print_exc()
+                pass
+        if nextsleep is not None:
+            #print "Sleeping for %s (%s)" % (nextsleep, delay)
+            time.sleep(nextsleep)
+
+    def server_exit(self):
+        # Tell idle functions we're exiting
+        for function, data in self._idlefuns.items():
+            try:
+                retval = function(self, data, True)
+            except:
+                pass
+
+class BitbakeServerInfo():
+    def __init__(self, server):
+        self.server = server
+        self.commands = server.commands
+
+class BitBakeServerFork():
+    def __init__(self, serverinfo, command, logfile):
+        serverinfo.forkCommand = command
+        serverinfo.logfile = logfile
+
+class BitBakeServerConnection():
+    def __init__(self, serverinfo):
+        self.server = serverinfo.server
+        self.connection = serverinfo.commands
+        self.events = bb.server.none.BBUIEventQueue(self.server)
+
+    def terminate(self):
+        try:
+            self.events.system_quit()
+        except:
+            pass
+        try:
+            self.connection.terminateServer()
+        except:
+            pass
+
--- a/bitbake/lib/bb/server/xmlrpc.py
+++ b/bitbake/lib/bb/server/xmlrpc.py
@@ -0,0 +1,187 @@
+#
+# BitBake XMLRPC Server
+#
+# Copyright (C) 2006 - 2007  Michael 'Mickey' Lauer
+# Copyright (C) 2006 - 2008  Richard Purdie
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+"""
+    This module implements an xmlrpc server for BitBake.
+
+    Use this by deriving a class from BitBakeXMLRPCServer and then adding
+    methods which you want to "export" via XMLRPC. If the methods have the
+    prefix xmlrpc_, then registering those function will happen automatically,
+    if not, you need to call register_function.
+
+    Use register_idle_function() to add a function which the xmlrpc server
+    calls from within server_forever when no requests are pending. Make sure
+    that those functions are non-blocking or else you will introduce latency
+    in the server's main loop.
+"""
+
+import bb
+import xmlrpclib, sys
+from bb import daemonize
+from bb.ui import uievent
+
+DEBUG = False
+
+from SimpleXMLRPCServer import SimpleXMLRPCServer, SimpleXMLRPCRequestHandler
+import inspect, select
+
+if sys.hexversion < 0x020600F0:
+    print "Sorry, python 2.6 or later is required for bitbake's XMLRPC mode"
+    sys.exit(1)
+
+class BitBakeServerCommands():
+    def __init__(self, server, cooker):
+        self.cooker = cooker
+        self.server = server
+
+    def registerEventHandler(self, host, port):
+        """
+        Register a remote UI Event Handler
+        """
+        s = xmlrpclib.Server("http://%s:%d" % (host, port), allow_none=True)
+        return bb.event.register_UIHhandler(s)
+
+    def unregisterEventHandler(self, handlerNum):
+        """
+        Unregister a remote UI Event Handler
+        """
+        return bb.event.unregister_UIHhandler(handlerNum)
+
+    def runCommand(self, command):
+        """
+        Run a cooker command on the server
+        """
+        return self.cooker.command.runCommand(command)
+
+    def terminateServer(self):
+        """
+        Trigger the server to quit
+        """
+        self.server.quit = True
+        print "Server (cooker) exitting"
+        return
+
+    def ping(self):
+        """
+        Dummy method which can be used to check the server is still alive
+        """
+        return True
+
+class BitBakeServer(SimpleXMLRPCServer):
+    # remove this when you're done with debugging
+    # allow_reuse_address = True
+
+    def __init__(self, cooker, interface = ("localhost", 0)):
+        """
+	Constructor
+	"""
+        SimpleXMLRPCServer.__init__(self, interface,
+                                    requestHandler=SimpleXMLRPCRequestHandler,
+                                    logRequests=False, allow_none=True)
+        self._idlefuns = {}
+        self.host, self.port = self.socket.getsockname()
+        #self.register_introspection_functions()
+        commands = BitBakeServerCommands(self, cooker)
+        self.autoregister_all_functions(commands, "")
+
+    def autoregister_all_functions(self, context, prefix):
+        """
+        Convenience method for registering all functions in the scope
+        of this class that start with a common prefix
+        """
+        methodlist = inspect.getmembers(context, inspect.ismethod)
+        for name, method in methodlist:
+            if name.startswith(prefix):
+                self.register_function(method, name[len(prefix):])
+
+    def register_idle_function(self, function, data):
+        """Register a function to be called while the server is idle"""
+        assert callable(function)
+        self._idlefuns[function] = data
+
+    def serve_forever(self):
+        """
+        Serve Requests. Overloaded to honor a quit command
+        """
+        self.quit = False
+        self.timeout = 0 # Run Idle calls for our first callback
+        while not self.quit:
+            #print "Idle queue length %s" % len(self._idlefuns)
+            self.handle_request()
+            #print "Idle timeout, running idle functions"
+            nextsleep = None
+            for function, data in self._idlefuns.items():
+                try:
+                    retval = function(self, data, False)
+                    if retval is False:
+                        del self._idlefuns[function]
+                    elif retval is True:
+                        nextsleep = 0
+                    elif nextsleep is 0:
+                        continue
+                    elif nextsleep is None:
+                        nextsleep = retval
+                    elif retval < nextsleep:
+                        nextsleep = retval
+                except SystemExit:
+                    raise
+                except:
+                    import traceback
+                    traceback.print_exc()
+                    pass
+            if nextsleep is None and len(self._idlefuns) > 0:
+                nextsleep = 0  
+            self.timeout = nextsleep
+        # Tell idle functions we're exiting
+        for function, data in self._idlefuns.items():
+            try:
+                retval = function(self, data, True)
+            except:
+                pass
+
+        self.server_close()
+        return
+
+class BitbakeServerInfo():
+    def __init__(self, server):
+        self.host = server.host
+        self.port = server.port
+
+class BitBakeServerFork():
+    def __init__(self, serverinfo, command, logfile):
+        daemonize.createDaemon(command, logfile)
+
+class BitBakeServerConnection():
+    def __init__(self, serverinfo):
+        self.connection = xmlrpclib.Server("http://%s:%s" % (serverinfo.host, serverinfo.port),  allow_none=True)
+        self.events = uievent.BBUIEventQueue(self.connection)
+
+    def terminate(self):
+        # Don't wait for server indefinitely
+        import socket
+        socket.setdefaulttimeout(2) 
+        try:
+            self.events.system_quit()
+        except:
+            pass
+        try:
+            self.connection.terminateServer()
+        except:
+            pass
+
--- a/bitbake/lib/bb/shell.py
+++ b/bitbake/lib/bb/shell.py
@@ -147,13 +147,10 @@ class BitBakeShellCommands:
        global last_exception
        globexpr = params[0]
        self._checkParsed()
-        names = globfilter( cooker.status.pkg_pn.keys(), globexpr )
+        names = globfilter( cooker.status.pkg_pn, globexpr )
        if len( names ) == 0: names = [ globexpr ]
        print "SHELL: Building %s" % ' '.join( names )

-        oldcmd = cooker.configuration.cmd
-        cooker.configuration.cmd = cmd
-
        td = taskdata.TaskData(cooker.configuration.abort)
        localdata = data.createCopy(cooker.configuration.data)
        data.update_data(localdata)
@@ -168,7 +165,7 @@ class BitBakeShellCommands:
                if len(providers) == 0:
                    raise Providers.NoProvider

-                tasks.append([name, "do_%s" % cooker.configuration.cmd])
+                tasks.append([name, "do_%s" % cmd])

            td.add_unresolved(localdata, cooker.status)
            
@@ -189,7 +186,6 @@ class BitBakeShellCommands:
            print "ERROR: Couldn't build '%s'" % names
            last_exception = e

-        cooker.configuration.cmd = oldcmd

    build.usage = "<providee>"

@@ -208,6 +204,11 @@ class BitBakeShellCommands:
        self.build( params, "configure" )
    configure.usage = "<providee>"

+    def install( self, params ):
+        """Execute 'install' on a providee"""
+        self.build( params, "install" )
+    install.usage = "<providee>"
+
    def edit( self, params ):
        """Call $EDITOR on a providee"""
        name = params[0]
@@ -240,32 +241,14 @@ class BitBakeShellCommands:
        bf = completeFilePath( name )
        print "SHELL: Calling '%s' on '%s'" % ( cmd, bf )

-        oldcmd = cooker.configuration.cmd
-        cooker.configuration.cmd = cmd
-
-        thisdata = data.createCopy(cooker.configuration.data)
-        data.update_data(thisdata)
-        data.expandKeys(thisdata)
-
        try:
-            bbfile_data = parse.handle( bf, thisdata )
+            cooker.buildFile(bf, cmd)
        except parse.ParseError:
            print "ERROR: Unable to open or parse '%s'" % bf
-        else:
-            # Remove stamp for target if force mode active
-            if cooker.configuration.force:
-                bb.msg.note(2, bb.msg.domain.RunQueue, "Remove stamp %s, %s" % (cmd, bf))
-                bb.build.del_stamp('do_%s' % cmd, bbfile_data)
+        except build.EventException, e:
+            print "ERROR: Couldn't build '%s'" % name
+            last_exception = e

-            item = data.getVar('PN', bbfile_data, 1)
-            data.setVar( "_task_cache", [], bbfile_data ) # force
-            try:
-                cooker.tryBuildPackage( os.path.abspath( bf ), item, cmd, bbfile_data, True )
-            except build.EventException, e:
-                print "ERROR: Couldn't build '%s'" % name
-                last_exception = e
-
-        cooker.configuration.cmd = oldcmd
    fileBuild.usage = "<bbfile>"

    def fileClean( self, params ):
@@ -290,7 +273,7 @@ class BitBakeShellCommands:
        print "SHELL: Parsing '%s'" % bbfile
        parse.update_mtime( bbfile )
        cooker.bb_cache.cacheValidUpdate(bbfile)
-        fromCache = cooker.bb_cache.loadData(bbfile, cooker.configuration.data)
+        fromCache = cooker.bb_cache.loadData(bbfile, cooker.configuration.data, cooker.status)
        cooker.bb_cache.sync()
        if False: #fromCache:
            print "SHELL: File has not been updated, not reparsing"
@@ -311,9 +294,7 @@ class BitBakeShellCommands:
    def help( self, params ):
        """Show a comprehensive list of commands and their purpose"""
        print "="*30, "Available Commands", "="*30
-        allcmds = cmds.keys()
-        allcmds.sort()
-        for cmd in allcmds:
+        for cmd in sorted(cmds):
            function,numparams,usage,helptext = cmds[cmd]
            print "| %s | %s" % (usage.ljust(30), helptext)
        print "="*78
@@ -339,10 +320,10 @@ class BitBakeShellCommands:
        what, globexpr = params
        if what == "files":
            self._checkParsed()
-            for key in globfilter( cooker.status.pkg_fn.keys(), globexpr ): print key
+            for key in globfilter( cooker.status.pkg_fn, globexpr ): print key
        elif what == "providers":
            self._checkParsed()
-            for key in globfilter( cooker.status.pkg_pn.keys(), globexpr ): print key
+            for key in globfilter( cooker.status.pkg_pn, globexpr ): print key
        else:
            print "Usage: match %s" % self.print_.usage
    match.usage = "<files|providers> <glob>"
@@ -490,10 +471,10 @@ SRC_URI = ""
        what = params[0]
        if what == "files":
            self._checkParsed()
-            for key in cooker.status.pkg_fn.keys(): print key
+            for key in cooker.status.pkg_fn: print key
        elif what == "providers":
            self._checkParsed()
-            for key in cooker.status.providers.keys(): print key
+            for key in cooker.status.providers: print key
        else:
            print "Usage: print %s" % self.print_.usage
    print_.usage = "<files|providers>"
@@ -507,7 +488,7 @@ SRC_URI = ""
        interpreter.interact( "SHELL: Expert Mode - BitBake Python %s\nType 'help' for more information, press CTRL-D to switch back to BBSHELL." % sys.version )

    def showdata( self, params ):
-        """Show the parsed metadata for a given providee"""
+        """Execute 'showdata' on a providee"""
        cooker.showEnvironment(None, params)
    showdata.usage = "<providee>"

@@ -532,7 +513,7 @@ SRC_URI = ""

    def stage( self, params ):
        """Execute 'stage' on a providee"""
-        self.build( params, "stage" )
+        self.build( params, "populate_staging" )
    stage.usage = "<providee>"

    def status( self, params ):
@@ -586,8 +567,9 @@ SRC_URI = ""

 def completeFilePath( bbfile ):
    """Get the complete bbfile path"""
+    if not cooker.status: return bbfile
    if not cooker.status.pkg_fn: return bbfile
-    for key in cooker.status.pkg_fn.keys():
+    for key in cooker.status.pkg_fn:
        if key.endswith( bbfile ):
            return key
    return bbfile
@@ -631,7 +613,7 @@ def completer( text, state ):
                    allmatches = cooker.configuration.data.keys()
                elif u == "<bbfile>":
                    if cooker.status.pkg_fn is None: allmatches = [ "(No Matches Available. Parsed yet?)" ]
-                    else: allmatches = [ x.split("/")[-1] for x in cooker.status.pkg_fn.keys() ]
+                    else: allmatches = [ x.split("/")[-1] for x in cooker.status.pkg_fn ]
                elif u == "<providee>":
                    if cooker.status.pkg_fn is None: allmatches = [ "(No Matches Available. Parsed yet?)" ]
                    else: allmatches = cooker.status.providers.iterkeys()
--- a/bitbake/lib/bb/taskdata.py
+++ b/bitbake/lib/bb/taskdata.py
@@ -23,14 +23,26 @@ Task data collection and handling
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

-from bb import data, event, mkdirhier, utils
-import bb, os
+import bb
+
+def re_match_strings(target, strings):
+    """
+    Whether or not the string 'target' matches
+    any one string of the strings which can be regular expression string
+    """
+    import re
+
+    for name in strings:
+        if (name==target or
+                re.search(name,target)!=None):
+            return True
+    return False

 class TaskData:
    """
    BitBake Task Data implementation
    """
-    def __init__(self, abort = True):
+    def __init__(self, abort = True, tryaltconfigs = False):
        self.build_names_index = []
        self.run_names_index = []
        self.fn_index = []
@@ -57,6 +69,7 @@ class TaskData:
        self.failed_fnids = []

        self.abort = abort
+        self.tryaltconfigs = tryaltconfigs

    def getbuild_id(self, name):
        """
@@ -91,6 +104,16 @@ class TaskData:

        return self.fn_index.index(name)

+    def gettask_ids(self, fnid):
+        """
+        Return an array of the ID numbers matching a given fnid.
+        """
+        ids = []
+        if fnid in self.tasks_lookup:
+            for task in self.tasks_lookup[fnid]:
+                ids.append(self.tasks_lookup[fnid][task])
+        return ids
+
    def gettask_id(self, fn, task, create = True):
        """
        Return an ID number for the task matching fn and task.
@@ -124,7 +147,6 @@ class TaskData:
        Add tasks for a given fn to the database
        """

-        task_graph = dataCache.task_queues[fn]
        task_deps = dataCache.task_deps[fn]

        fnid = self.getfn_id(fn)
@@ -136,11 +158,11 @@ class TaskData:
        if fnid in self.tasks_fnid:
            return

-        for task in task_graph.allnodes():
+        for task in task_deps['tasks']:

            # Work out task dependencies
            parentids = []
-            for dep in task_graph.getparents(task):
+            for dep in task_deps['parents'][task]:
                parentid = self.gettask_id(fn, dep)
                parentids.append(parentid)
            taskid = self.gettask_id(fn, task)
@@ -151,7 +173,9 @@ class TaskData:
                ids = []
                for dep in task_deps['depends'][task].split():
                    if dep:
-                        ids.append(str(self.getbuild_id(dep.split(":")[0])) + ":" + dep.split(":")[1])
+                        if ":" not in dep:
+                            bb.msg.fatal(bb.msg.domain.TaskData, "Error, dependency %s does not contain ':' character\n. Task 'depends' should be specified in the form 'packagename:task'" % (dep, fn))
+                        ids.append(((self.getbuild_id(dep.split(":")[0])), dep.split(":")[1]))
                self.tasks_idepends[taskid].extend(ids)

        # Work out build dependencies
@@ -168,11 +192,11 @@ class TaskData:
            rdepends = dataCache.rundeps[fn]
            rrecs = dataCache.runrecs[fn]
            for package in rdepends:
-                for rdepend in rdepends[package]:
+                for rdepend in bb.utils.explode_deps(rdepends[package]):
                    bb.msg.debug(2, bb.msg.domain.TaskData, "Added runtime dependency %s for %s" % (rdepend, fn))
                    rdependids[self.getrun_id(rdepend)] = None
            for package in rrecs:
-                for rdepend in rrecs[package]:
+                for rdepend in bb.utils.explode_deps(rrecs[package]):
                    bb.msg.debug(2, bb.msg.domain.TaskData, "Added runtime recommendation %s for %s" % (rdepend, fn))
                    rdependids[self.getrun_id(rdepend)] = None
            self.rdepids[fnid] = rdependids.keys()
@@ -252,7 +276,7 @@ class TaskData:
        """
        unresolved = []
        for target in self.build_names_index:
-            if target in dataCache.ignored_dependencies:
+            if re_match_strings(target, dataCache.ignored_dependencies):
                continue
            if self.build_names_index.index(target) in self.failed_deps:
                continue
@@ -267,7 +291,7 @@ class TaskData:
        """
        unresolved = []
        for target in self.run_names_index:
-            if target in dataCache.ignored_dependencies:
+            if re_match_strings(target, dataCache.ignored_dependencies):
                continue
            if self.run_names_index.index(target) in self.failed_rdeps:
                continue
@@ -330,7 +354,10 @@ class TaskData:
            self.add_provider_internal(cfgData, dataCache, item)
        except bb.providers.NoProvider:
            if self.abort:
-                bb.msg.error(bb.msg.domain.Provider, "Nothing PROVIDES '%s' (but '%s' DEPENDS on or otherwise requires it)" % (item, self.get_dependees_str(item)))
+                if self.get_rdependees_str(item):
+                    bb.msg.error(bb.msg.domain.Provider, "Nothing PROVIDES '%s' (but '%s' DEPENDS on or otherwise requires it)" % (item, self.get_dependees_str(item)))
+                else:
+                    bb.msg.error(bb.msg.domain.Provider, "Nothing PROVIDES '%s'" % (item))
                raise
            targetid = self.getbuild_id(item)
            self.remove_buildtarget(targetid)
@@ -344,12 +371,15 @@ class TaskData:
        added internally during dependency resolution
        """

-        if item in dataCache.ignored_dependencies:
+        if re_match_strings(item, dataCache.ignored_dependencies):
            return

        if not item in dataCache.providers:
-            bb.msg.note(2, bb.msg.domain.Provider, "Nothing PROVIDES '%s' (but '%s' DEPENDS on or otherwise requires it)" % (item, self.get_dependees_str(item)))
-            bb.event.fire(bb.event.NoProvider(item, cfgData))
+            if self.get_rdependees_str(item):
+                bb.msg.note(2, bb.msg.domain.Provider, "Nothing PROVIDES '%s' (but '%s' DEPENDS on or otherwise requires it)" % (item, self.get_dependees_str(item)))
+            else:
+                bb.msg.note(2, bb.msg.domain.Provider, "Nothing PROVIDES '%s'" % (item))
+            bb.event.fire(bb.event.NoProvider(item), cfgData)
            raise bb.providers.NoProvider(item)

        if self.have_build_target(item):
@@ -358,15 +388,11 @@ class TaskData:
        all_p = dataCache.providers[item]

        eligible, foundUnique = bb.providers.filterProviders(all_p, item, cfgData, dataCache)
-
-        for p in eligible:
-            fnid = self.getfn_id(p)
-            if fnid in self.failed_fnids:
-                eligible.remove(p)
+        eligible = [p for p in eligible if not self.getfn_id(p) in self.failed_fnids]

        if not eligible:
            bb.msg.note(2, bb.msg.domain.Provider, "No buildable provider PROVIDES '%s' but '%s' DEPENDS on or otherwise requires it. Enable debugging and see earlier logs to find unbuildable providers." % (item, self.get_dependees_str(item)))
-            bb.event.fire(bb.event.NoProvider(item, cfgData))
+            bb.event.fire(bb.event.NoProvider(item), cfgData)
            raise bb.providers.NoProvider(item)

        if len(eligible) > 1 and foundUnique == False:
@@ -376,7 +402,7 @@ class TaskData:
                    providers_list.append(dataCache.pkg_fn[fn])
                bb.msg.note(1, bb.msg.domain.Provider, "multiple providers are available for %s (%s);" % (item, ", ".join(providers_list)))
                bb.msg.note(1, bb.msg.domain.Provider, "consider defining PREFERRED_PROVIDER_%s" % item)
-                bb.event.fire(bb.event.MultipleProviders(item, providers_list, cfgData))
+                bb.event.fire(bb.event.MultipleProviders(item, providers_list), cfgData)
            self.consider_msgs_cache.append(item)

        for fn in eligible:
@@ -396,7 +422,7 @@ class TaskData:
        (takes item names from RDEPENDS/PACKAGES namespace)
        """

-        if item in dataCache.ignored_dependencies:
+        if re_match_strings(item, dataCache.ignored_dependencies):
            return

        if self.have_runtime_target(item):
@@ -406,19 +432,15 @@ class TaskData:

        if not all_p:
            bb.msg.error(bb.msg.domain.Provider, "'%s' RDEPENDS/RRECOMMENDS or otherwise requires the runtime entity '%s' but it wasn't found in any PACKAGE or RPROVIDES variables" % (self.get_rdependees_str(item), item))
-            bb.event.fire(bb.event.NoProvider(item, cfgData, runtime=True))
+            bb.event.fire(bb.event.NoProvider(item, runtime=True), cfgData)
            raise bb.providers.NoRProvider(item)

        eligible, numberPreferred = bb.providers.filterProvidersRunTime(all_p, item, cfgData, dataCache)
-
-        for p in eligible:
-            fnid = self.getfn_id(p)
-            if fnid in self.failed_fnids:
-                eligible.remove(p)
+        eligible = [p for p in eligible if not self.getfn_id(p) in self.failed_fnids]

        if not eligible:
            bb.msg.error(bb.msg.domain.Provider, "'%s' RDEPENDS/RRECOMMENDS or otherwise requires the runtime entity '%s' but it wasn't found in any PACKAGE or RPROVIDES variables of any buildable targets.\nEnable debugging and see earlier logs to find unbuildable targets." % (self.get_rdependees_str(item), item))
-            bb.event.fire(bb.event.NoProvider(item, cfgData, runtime=True))
+            bb.event.fire(bb.event.NoProvider(item, runtime=True), cfgData)
            raise bb.providers.NoRProvider(item)

        if len(eligible) > 1 and numberPreferred == 0:
@@ -428,7 +450,7 @@ class TaskData:
                    providers_list.append(dataCache.pkg_fn[fn])
                bb.msg.note(2, bb.msg.domain.Provider, "multiple providers are available for runtime %s (%s);" % (item, ", ".join(providers_list)))
                bb.msg.note(2, bb.msg.domain.Provider, "consider defining a PREFERRED_PROVIDER entry to match runtime %s" % item)
-                bb.event.fire(bb.event.MultipleProviders(item,providers_list, cfgData, runtime=True))
+                bb.event.fire(bb.event.MultipleProviders(item,providers_list, runtime=True), cfgData)
            self.consider_msgs_cache.append(item)

        if numberPreferred > 1:
@@ -438,7 +460,7 @@ class TaskData:
                    providers_list.append(dataCache.pkg_fn[fn])
                bb.msg.note(2, bb.msg.domain.Provider, "multiple providers are available for runtime %s (top %s entries preferred) (%s);" % (item, numberPreferred, ", ".join(providers_list)))
                bb.msg.note(2, bb.msg.domain.Provider, "consider defining only one PREFERRED_PROVIDER entry to match runtime %s" % item)
-                bb.event.fire(bb.event.MultipleProviders(item,providers_list, cfgData, runtime=True))
+                bb.event.fire(bb.event.MultipleProviders(item,providers_list, runtime=True), cfgData)
            self.consider_msgs_cache.append(item)

        # run through the list until we find one that we can build
@@ -459,8 +481,6 @@ class TaskData:
        """
        if fnid in self.failed_fnids:
            return
-        if not missing_list:
-            missing_list = [fnid]
        bb.msg.debug(1, bb.msg.domain.Provider, "File '%s' is unbuildable, removing..." % self.fn_index[fnid])
        self.failed_fnids.append(fnid)
        for target in self.build_targets:
@@ -488,6 +508,12 @@ class TaskData:
        dependees = self.get_dependees(targetid)
        for fnid in dependees:
            self.fail_fnid(fnid, missing_list)
+        for taskid in range(len(self.tasks_idepends)):
+            idepends = self.tasks_idepends[taskid]
+            for (idependid, idependtask) in idepends:
+                if idependid == targetid:
+                    self.fail_fnid(self.tasks_fnid[taskid], missing_list)
+
        if self.abort and targetid in self.external_targets:
            bb.msg.error(bb.msg.domain.Provider, "Required build target '%s' has no buildable providers.\nMissing or unbuildable dependency chain was: %s" % (self.build_names_index[targetid], missing_list))
            raise bb.providers.NoProvider
@@ -522,7 +548,10 @@ class TaskData:
                except bb.providers.NoProvider:
                    targetid = self.getbuild_id(target)
                    if self.abort and targetid in self.external_targets:
-                        bb.msg.error(bb.msg.domain.Provider, "Nothing PROVIDES '%s' (but '%s' DEPENDS on or otherwise requires it)" % (target, self.get_dependees_str(target)))
+                        if self.get_rdependees_str(target):
+                            bb.msg.error(bb.msg.domain.Provider, "Nothing PROVIDES '%s' (but '%s' DEPENDS on or otherwise requires it)" % (target, self.get_dependees_str(target)))
+                        else:
+                            bb.msg.error(bb.msg.domain.Provider, "Nothing PROVIDES '%s'" % (target))
                        raise
                    self.remove_buildtarget(targetid)
            for target in self.get_unresolved_run_targets(dataCache):
@@ -531,7 +560,7 @@ class TaskData:
                    added = added + 1
                except bb.providers.NoRProvider:
                    self.remove_runtarget(self.getrun_id(target))
-            bb.msg.debug(1, bb.msg.domain.TaskData, "Resolved " + str(added) + " extra dependecies")
+            bb.msg.debug(1, bb.msg.domain.TaskData, "Resolved " + str(added) + " extra dependencies")
            if added == 0:
                break
        # self.dump_data()
--- a/bitbake/lib/bb/ui/init.py
+++ b/bitbake/lib/bb/ui/init.py
@@ -0,0 +1,18 @@
+#
+# BitBake UI Implementation
+#
+# Copyright (C) 2006-2007 Richard Purdie
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
--- a/bitbake/lib/bb/ui/crumbs/init.py
+++ b/bitbake/lib/bb/ui/crumbs/init.py
@@ -0,0 +1,18 @@
+#
+# BitBake UI Implementation
+#
+# Copyright (C) 2006-2007 Richard Purdie
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
--- a/bitbake/lib/bb/ui/crumbs/buildmanager.py
+++ b/bitbake/lib/bb/ui/crumbs/buildmanager.py
@@ -0,0 +1,457 @@
+#
+# BitBake Graphical GTK User Interface
+#
+# Copyright (C) 2008        Intel Corporation
+#
+# Authored by Rob Bradford <rob@linux.intel.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import gtk
+import gobject
+import threading
+import os
+import datetime
+import time
+
+class BuildConfiguration:
+    """ Represents a potential *or* historic *or* concrete build. It
+    encompasses all the things that we need to tell bitbake to do to make it
+    build what we want it to build. 
+
+    It also stored the metadata URL and the set of possible machines (and the
+    distros / images / uris for these. Apart from the metdata URL these are
+    not serialised to file (since they may be transient). In some ways this
+    functionality might be shifted to the loader class."""
+
+    def __init__ (self):
+        self.metadata_url = None
+
+        # Tuple of (distros, image, urls)
+        self.machine_options = {}
+
+        self.machine = None
+        self.distro = None
+        self.image = None
+        self.urls = []
+        self.extra_urls = []
+        self.extra_pkgs = []
+
+    def get_machines_model (self):
+        model = gtk.ListStore (gobject.TYPE_STRING)
+        for machine in self.machine_options.keys():
+            model.append ([machine])
+
+        return model
+
+    def get_distro_and_images_models (self, machine):
+        distro_model = gtk.ListStore (gobject.TYPE_STRING)
+
+        for distro in self.machine_options[machine][0]:
+            distro_model.append ([distro])
+
+        image_model = gtk.ListStore (gobject.TYPE_STRING)
+
+        for image in self.machine_options[machine][1]:
+            image_model.append ([image])
+
+        return (distro_model, image_model)
+
+    def get_repos (self):
+        self.urls = self.machine_options[self.machine][2]
+        return self.urls
+
+    # It might be a lot lot better if we stored these in like, bitbake conf
+    # file format. 
+    @staticmethod 
+    def load_from_file (filename):
+        f = open (filename, "r")
+
+        conf = BuildConfiguration()
+        for line in f.readlines():
+            data = line.split (";")[1]
+            if (line.startswith ("metadata-url;")):
+                conf.metadata_url = data.strip()
+                continue
+            if (line.startswith ("url;")):
+                conf.urls += [data.strip()]
+                continue
+            if (line.startswith ("extra-url;")):
+                conf.extra_urls += [data.strip()]
+                continue
+            if (line.startswith ("machine;")):
+                conf.machine = data.strip()
+                continue
+            if (line.startswith ("distribution;")):
+                conf.distro = data.strip()
+                continue
+            if (line.startswith ("image;")):
+                conf.image = data.strip()
+                continue
+
+        f.close ()
+        return conf
+
+    # Serialise to a file. This is part of the build process and we use this
+    # to be able to repeat a given build (using the same set of parameters)
+    # but also so that we can include the details of the image / machine /
+    # distro in the build manager tree view.
+    def write_to_file (self, filename):
+        f = open (filename, "w")
+
+        lines = []
+
+        if (self.metadata_url):
+            lines += ["metadata-url;%s\n" % (self.metadata_url)]
+
+        for url in self.urls:
+            lines += ["url;%s\n" % (url)]
+
+        for url in self.extra_urls:
+            lines += ["extra-url;%s\n" % (url)]
+
+        if (self.machine):
+            lines += ["machine;%s\n" % (self.machine)]
+
+        if (self.distro):
+            lines += ["distribution;%s\n" % (self.distro)]
+
+        if (self.image):
+            lines += ["image;%s\n" % (self.image)]
+
+        f.writelines (lines)
+        f.close ()
+
+class BuildResult(gobject.GObject):
+    """ Represents an historic build. Perhaps not successful. But it includes
+    things such as the files that are in the directory (the output from the
+    build) as well as a deserialised BuildConfiguration file that is stored in
+    ".conf" in the directory for the build.
+
+    This is GObject so that it can be included in the TreeStore."""
+    
+    (STATE_COMPLETE, STATE_FAILED, STATE_ONGOING) = \
+        (0, 1, 2)
+
+    def __init__ (self, parent, identifier):
+        gobject.GObject.__init__ (self)
+        self.date = None 
+
+        self.files = []
+        self.status = None
+        self.identifier = identifier
+        self.path = os.path.join (parent, identifier)
+
+        # Extract the date, since the directory name is of the
+        # format build-<year><month><day>-<ordinal> we can easily
+        # pull it out.
+        # TODO: Better to stat a file?
+        (_ , date, revision) = identifier.split ("-")
+        print date
+
+        year = int (date[0:4])
+        month = int (date[4:6])
+        day = int (date[6:8])
+
+        self.date = datetime.date (year, month, day)
+
+        self.conf = None
+
+        # By default builds are STATE_FAILED unless we find a "complete" file
+        # in which case they are STATE_COMPLETE
+        self.state = BuildResult.STATE_FAILED
+        for file in os.listdir (self.path):
+            if (file.startswith (".conf")):
+                conffile = os.path.join (self.path, file)
+                self.conf = BuildConfiguration.load_from_file (conffile)
+            elif (file.startswith ("complete")):
+                self.state = BuildResult.STATE_COMPLETE
+            else:
+                self.add_file (file)
+
+    def add_file (self, file):
+        # Just add the file for now. Don't care about the type. 
+        self.files += [(file, None)]
+
+class BuildManagerModel (gtk.TreeStore):
+    """ Model for the BuildManagerTreeView. This derives from gtk.TreeStore
+    but it abstracts nicely what the columns mean and the setup of the columns
+    in the model. """
+
+    (COL_IDENT, COL_DESC, COL_MACHINE, COL_DISTRO, COL_BUILD_RESULT, COL_DATE, COL_STATE) = \
+        (0, 1, 2, 3, 4, 5, 6)
+
+    def __init__ (self):
+        gtk.TreeStore.__init__ (self,
+            gobject.TYPE_STRING, 
+            gobject.TYPE_STRING,
+            gobject.TYPE_STRING,
+            gobject.TYPE_STRING,
+            gobject.TYPE_OBJECT,
+            gobject.TYPE_INT64,
+            gobject.TYPE_INT)
+
+class BuildManager (gobject.GObject):
+    """ This class manages the historic builds that have been found in the
+    "results" directory but is also used for starting a new build."""
+
+    __gsignals__ = {
+        'population-finished' : (gobject.SIGNAL_RUN_LAST, 
+                                 gobject.TYPE_NONE,
+                                 ()),
+        'populate-error' : (gobject.SIGNAL_RUN_LAST,
+                            gobject.TYPE_NONE,
+                            ())
+    }
+
+    def update_build_result (self, result, iter):
+        # Convert the date into something we can sort by.
+        date = long (time.mktime (result.date.timetuple()))
+
+        # Add a top level entry for the build
+        
+        self.model.set (iter, 
+            BuildManagerModel.COL_IDENT, result.identifier,
+            BuildManagerModel.COL_DESC, result.conf.image,
+            BuildManagerModel.COL_MACHINE, result.conf.machine, 
+            BuildManagerModel.COL_DISTRO, result.conf.distro, 
+            BuildManagerModel.COL_BUILD_RESULT, result, 
+            BuildManagerModel.COL_DATE, date,
+            BuildManagerModel.COL_STATE, result.state)
+
+        # And then we use the files in the directory as the children for the
+        # top level iter.
+        for file in result.files:
+            self.model.append (iter, (None, file[0], None, None, None, date, -1))
+
+    # This function is called as an idle by the BuildManagerPopulaterThread
+    def add_build_result (self, result):
+        gtk.gdk.threads_enter()
+        self.known_builds += [result]
+
+        self.update_build_result (result, self.model.append (None))
+
+        gtk.gdk.threads_leave()
+
+    def notify_build_finished (self):
+        # This is a bit of a hack. If we have a running build running then we
+        # will have a row in the model in STATE_ONGOING. Find it and make it
+        # as if it was a proper historic build (well, it is completed now....)
+
+        # We need to use the iters here rather than the Python iterator
+        # interface to the model since we need to pass it into
+        # update_build_result
+
+        iter = self.model.get_iter_first()
+
+        while (iter):
+            (ident, state) = self.model.get(iter,
+                BuildManagerModel.COL_IDENT, 
+                BuildManagerModel.COL_STATE)
+
+            if state == BuildResult.STATE_ONGOING:
+                result = BuildResult (self.results_directory, ident)
+                self.update_build_result (result, iter)
+            iter = self.model.iter_next(iter)
+
+    def notify_build_succeeded (self):
+        # Write the "complete" file so that when we create the BuildResult
+        # object we put into the model
+
+        complete_file_path = os.path.join (self.cur_build_directory, "complete")
+        f = file (complete_file_path, "w")
+        f.close()
+        self.notify_build_finished()
+
+    def notify_build_failed (self):
+        # Without a "complete" file then this will mark the build as failed:
+        self.notify_build_finished()
+
+    # This function is called as an idle
+    def emit_population_finished_signal (self):
+        gtk.gdk.threads_enter()
+        self.emit ("population-finished")
+        gtk.gdk.threads_leave()
+
+    class BuildManagerPopulaterThread (threading.Thread):
+        def __init__ (self, manager, directory):
+            threading.Thread.__init__ (self)
+            self.manager = manager
+            self.directory = directory
+
+        def run (self):
+            # For each of the "build-<...>" directories ..
+
+            if os.path.exists (self.directory):
+                for directory in os.listdir (self.directory):
+
+                    if not directory.startswith ("build-"):
+                        continue
+
+                    build_result = BuildResult (self.directory, directory)
+                    self.manager.add_build_result (build_result)
+
+            gobject.idle_add (BuildManager.emit_population_finished_signal,
+                self.manager)
+
+    def __init__ (self, server, results_directory):
+        gobject.GObject.__init__ (self)
+
+        # The builds that we've found from walking the result directory
+        self.known_builds = []
+
+        # Save out the bitbake server, we need this for issuing commands to
+        # the cooker:
+        self.server = server
+
+        # The TreeStore that we use
+        self.model = BuildManagerModel ()
+
+        # The results directory is where we create (and look for) the
+        # build-<xyz>-<n> directories. We need to populate ourselves from
+        # directory
+        self.results_directory = results_directory
+        self.populate_from_directory (self.results_directory)
+
+    def populate_from_directory (self, directory):
+        thread = BuildManager.BuildManagerPopulaterThread (self, directory)
+        thread.start()
+
+    # Come up with the name for the next build ident by combining "build-"
+    # with the date formatted as yyyymmdd and then an ordinal. We do this by
+    # an optimistic algorithm incrementing the ordinal if we find that it
+    # already exists.
+    def get_next_build_ident (self):
+        today = datetime.date.today ()
+        datestr = str (today.year) + str (today.month) + str (today.day)
+
+        revision = 0
+        test_name = "build-%s-%d" % (datestr, revision)
+        test_path = os.path.join (self.results_directory, test_name)
+
+        while (os.path.exists (test_path)):
+            revision += 1
+            test_name = "build-%s-%d" % (datestr, revision)
+            test_path = os.path.join (self.results_directory, test_name)
+
+        return test_name
+
+    # Take a BuildConfiguration and then try and build it based on the
+    # parameters of that configuration. S
+    def do_build (self, conf):
+        server = self.server
+
+        # Work out the build directory. Note we actually create the
+        # directories here since we need to write the ".conf" file. Otherwise
+        # we could have relied on bitbake's builder thread to actually make
+        # the directories as it proceeds with the build.
+        ident = self.get_next_build_ident ()
+        build_directory = os.path.join (self.results_directory,
+            ident)
+        self.cur_build_directory = build_directory
+        os.makedirs (build_directory)
+
+        conffile = os.path.join (build_directory, ".conf")
+        conf.write_to_file (conffile)
+
+        # Add a row to the model representing this ongoing build. It's kinda a
+        # fake entry. If this build completes or fails then this gets updated
+        # with the real stuff like the historic builds
+        date = long (time.time())
+        self.model.append (None, (ident, conf.image, conf.machine, conf.distro,
+            None, date, BuildResult.STATE_ONGOING))
+        try:
+            server.runCommand(["setVariable", "BUILD_IMAGES_FROM_FEEDS", 1])
+            server.runCommand(["setVariable", "MACHINE", conf.machine])
+            server.runCommand(["setVariable", "DISTRO", conf.distro])
+            server.runCommand(["setVariable", "PACKAGE_CLASSES", "package_ipk"])
+            server.runCommand(["setVariable", "BBFILES", \
+              """${OEROOT}/meta/packages/*/*.bb ${OEROOT}/meta-moblin/packages/*/*.bb"""])
+            server.runCommand(["setVariable", "TMPDIR", "${OEROOT}/build/tmp"])
+            server.runCommand(["setVariable", "IPK_FEED_URIS", \
+                " ".join(conf.get_repos())])
+            server.runCommand(["setVariable", "DEPLOY_DIR_IMAGE",
+                build_directory])
+            server.runCommand(["buildTargets", [conf.image], "rootfs"])
+
+        except Exception, e:
+            print e
+
+class BuildManagerTreeView (gtk.TreeView):
+    """ The tree view for the build manager. This shows the historic builds
+    and so forth. """
+
+    # We use this function to control what goes in the cell since we store
+    # the date in the model as seconds since the epoch (for sorting) and so we
+    # need to make it human readable.
+    def date_format_custom_cell_data_func (self, col, cell, model, iter):
+        date = model.get (iter, BuildManagerModel.COL_DATE)[0]
+        datestr = time.strftime("%A %d %B %Y", time.localtime(date))
+        cell.set_property ("text", datestr)
+
+    # This format function controls what goes in the cell. We use this to map
+    # the integer state to a string and also to colourise the text
+    def state_format_custom_cell_data_fun (self, col, cell, model, iter):
+        state = model.get (iter, BuildManagerModel.COL_STATE)[0]
+
+        if (state == BuildResult.STATE_ONGOING):
+            cell.set_property ("text", "Active")
+            cell.set_property ("foreground", "#000000")
+        elif (state == BuildResult.STATE_FAILED):
+            cell.set_property ("text", "Failed")
+            cell.set_property ("foreground", "#ff0000")
+        elif (state == BuildResult.STATE_COMPLETE):
+            cell.set_property ("text", "Complete")
+            cell.set_property ("foreground", "#00ff00")
+        else:
+            cell.set_property ("text", "")
+
+    def __init__ (self):
+        gtk.TreeView.__init__(self)
+
+        # Misc descriptiony thing
+        renderer = gtk.CellRendererText ()
+        col = gtk.TreeViewColumn (None, renderer, 
+            text=BuildManagerModel.COL_DESC)
+        self.append_column (col)
+
+        # Machine
+        renderer = gtk.CellRendererText ()
+        col = gtk.TreeViewColumn ("Machine", renderer, 
+            text=BuildManagerModel.COL_MACHINE)
+        self.append_column (col)
+
+        # distro
+        renderer = gtk.CellRendererText ()
+        col = gtk.TreeViewColumn ("Distribution", renderer, 
+            text=BuildManagerModel.COL_DISTRO)
+        self.append_column (col)
+
+        # date (using a custom function for formatting the cell contents it
+        # takes epoch -> human readable string)
+        renderer = gtk.CellRendererText ()
+        col = gtk.TreeViewColumn ("Date", renderer, 
+            text=BuildManagerModel.COL_DATE)
+        self.append_column (col)
+        col.set_cell_data_func (renderer, 
+            self.date_format_custom_cell_data_func)
+
+        # For status.
+        renderer = gtk.CellRendererText ()
+        col = gtk.TreeViewColumn ("Status", renderer,
+            text = BuildManagerModel.COL_STATE)
+        self.append_column (col)
+        col.set_cell_data_func (renderer,
+            self.state_format_custom_cell_data_fun)
+
--- a/bitbake/lib/bb/ui/crumbs/puccho.glade
+++ b/bitbake/lib/bb/ui/crumbs/puccho.glade
@@ -0,0 +1,606 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--Generated with glade3 3.4.5 on Mon Nov 10 12:24:12 2008 -->
+<glade-interface>
+  <widget class="GtkDialog" id="build_dialog">
+    <property name="title" translatable="yes">Start a build</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkTable" id="build_table">
+            <property name="visible">True</property>
+            <property name="border_width">6</property>
+            <property name="n_rows">7</property>
+            <property name="n_columns">3</property>
+            <property name="column_spacing">5</property>
+            <property name="row_spacing">6</property>
+            <child>
+              <widget class="GtkAlignment" id="status_alignment">
+                <property name="visible">True</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <widget class="GtkHBox" id="status_hbox">
+                    <property name="spacing">6</property>
+                    <child>
+                      <widget class="GtkImage" id="status_image">
+                        <property name="visible">True</property>
+                        <property name="no_show_all">True</property>
+                        <property name="xalign">0</property>
+                        <property name="stock">gtk-dialog-error</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="status_label">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">If you see this text something is wrong...</property>
+                        <property name="use_markup">True</property>
+                        <property name="use_underline">True</property>
+                      </widget>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="right_attach">3</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">&lt;b&gt;Build configuration&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </widget>
+              <packing>
+                <property name="right_attach">3</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkComboBox" id="image_combo">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+              </widget>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="image_label">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="xalign">0</property>
+                <property name="xpad">12</property>
+                <property name="label" translatable="yes">Image:</property>
+              </widget>
+              <packing>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkComboBox" id="distribution_combo">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+              </widget>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="distribution_label">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="xalign">0</property>
+                <property name="xpad">12</property>
+                <property name="label" translatable="yes">Distribution:</property>
+              </widget>
+              <packing>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkComboBox" id="machine_combo">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+              </widget>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="machine_label">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="xalign">0</property>
+                <property name="xpad">12</property>
+                <property name="label" translatable="yes">Machine:</property>
+              </widget>
+              <packing>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="refresh_button">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="label" translatable="yes">gtk-refresh</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+              </widget>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkEntry" id="location_entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="width_chars">32</property>
+              </widget>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label3">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="xpad">12</property>
+                <property name="label" translatable="yes">Location:</property>
+              </widget>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">&lt;b&gt;Repository&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </widget>
+              <packing>
+                <property name="right_attach">3</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkAlignment" id="alignment1">
+                <property name="visible">True</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </widget>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkAlignment" id="alignment2">
+                <property name="visible">True</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </widget>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkAlignment" id="alignment3">
+                <property name="visible">True</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </widget>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkDialog" id="dialog2">
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox2">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkTable" id="table2">
+            <property name="visible">True</property>
+            <property name="border_width">6</property>
+            <property name="n_rows">7</property>
+            <property name="n_columns">3</property>
+            <property name="column_spacing">6</property>
+            <property name="row_spacing">6</property>
+            <child>
+              <widget class="GtkLabel" id="label7">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">&lt;b&gt;Repositories&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </widget>
+              <packing>
+                <property name="right_attach">3</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkAlignment" id="alignment4">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <widget class="GtkScrolledWindow" id="scrolledwindow1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <child>
+                      <widget class="GtkTreeView" id="treeview1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="headers_clickable">True</property>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="right_attach">3</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkEntry" id="entry1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+              </widget>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">3</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label9">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">&lt;b&gt;Additional packages&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </widget>
+              <packing>
+                <property name="right_attach">3</property>
+                <property name="top_attach">4</property>
+                <property name="bottom_attach">5</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkAlignment" id="alignment6">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="xscale">0</property>
+                <child>
+                  <widget class="GtkLabel" id="label8">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="yalign">0</property>
+                    <property name="xpad">12</property>
+                    <property name="label" translatable="yes">Location: </property>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkAlignment" id="alignment7">
+                <property name="visible">True</property>
+                <property name="xalign">1</property>
+                <property name="xscale">0</property>
+                <child>
+                  <widget class="GtkHButtonBox" id="hbuttonbox1">
+                    <property name="visible">True</property>
+                    <property name="spacing">5</property>
+                    <child>
+                      <widget class="GtkButton" id="button7">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="label" translatable="yes">gtk-remove</property>
+                        <property name="use_stock">True</property>
+                        <property name="response_id">0</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkButton" id="button6">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="label" translatable="yes">gtk-edit</property>
+                        <property name="use_stock">True</property>
+                        <property name="response_id">0</property>
+                      </widget>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkButton" id="button5">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="label" translatable="yes">gtk-add</property>
+                        <property name="use_stock">True</property>
+                        <property name="response_id">0</property>
+                      </widget>
+                      <packing>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">3</property>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkAlignment" id="alignment5">
+                <property name="visible">True</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </widget>
+              <packing>
+                <property name="top_attach">3</property>
+                <property name="bottom_attach">4</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label10">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
+                <property name="xpad">12</property>
+                <property name="label" translatable="yes">Search:</property>
+              </widget>
+              <packing>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkEntry" id="entry2">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+              </widget>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">3</property>
+                <property name="top_attach">5</property>
+                <property name="bottom_attach">6</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkAlignment" id="alignment8">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <widget class="GtkScrolledWindow" id="scrolledwindow2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <child>
+                      <widget class="GtkTreeView" id="treeview2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="headers_clickable">True</property>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="right_attach">3</property>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area2">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="button4">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="label" translatable="yes">gtk-close</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkWindow" id="main_window">
+    <child>
+      <widget class="GtkVBox" id="main_window_vbox">
+        <property name="visible">True</property>
+        <child>
+          <widget class="GtkToolbar" id="main_toolbar">
+            <property name="visible">True</property>
+            <child>
+              <widget class="GtkToolButton" id="main_toolbutton_build">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Build</property>
+                <property name="stock_id">gtk-execute</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkVPaned" id="vpaned1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <child>
+              <widget class="GtkScrolledWindow" id="results_scrolledwindow">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </widget>
+              <packing>
+                <property name="resize">False</property>
+                <property name="shrink">True</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkScrolledWindow" id="progress_scrolledwindow">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </widget>
+              <packing>
+                <property name="resize">True</property>
+                <property name="shrink">True</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+</glade-interface>
--- a/bitbake/lib/bb/ui/crumbs/runningbuild.py
+++ b/bitbake/lib/bb/ui/crumbs/runningbuild.py
@@ -0,0 +1,180 @@
+#
+# BitBake Graphical GTK User Interface
+#
+# Copyright (C) 2008        Intel Corporation
+#
+# Authored by Rob Bradford <rob@linux.intel.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import gtk
+import gobject
+
+class RunningBuildModel (gtk.TreeStore):
+    (COL_TYPE, COL_PACKAGE, COL_TASK, COL_MESSAGE, COL_ICON, COL_ACTIVE) = (0, 1, 2, 3, 4, 5)
+    def __init__ (self):
+        gtk.TreeStore.__init__ (self, 
+                                gobject.TYPE_STRING,
+                                gobject.TYPE_STRING,
+                                gobject.TYPE_STRING,
+                                gobject.TYPE_STRING,
+                                gobject.TYPE_STRING,
+                                gobject.TYPE_BOOLEAN)
+
+class RunningBuild (gobject.GObject):
+    __gsignals__ = {
+          'build-succeeded' : (gobject.SIGNAL_RUN_LAST, 
+                               gobject.TYPE_NONE,
+                               ()),
+          'build-failed' : (gobject.SIGNAL_RUN_LAST,
+                            gobject.TYPE_NONE,
+                            ())
+          }
+    pids_to_task = {}
+    tasks_to_iter = {}
+
+    def __init__ (self):
+        gobject.GObject.__init__ (self)
+        self.model = RunningBuildModel()
+
+    def handle_event (self, event):
+        # Handle an event from the event queue, this may result in updating
+        # the model and thus the UI. Or it may be to tell us that the build
+        # has finished successfully (or not, as the case may be.)
+
+        parent = None
+        pid = 0
+        package = None
+        task = None
+
+        # If we have a pid attached to this message/event try and get the
+        # (package, task) pair for it. If we get that then get the parent iter
+        # for the message.
+        if hasattr(event, 'pid'):
+            pid = event.pid
+            if self.pids_to_task.has_key(pid):
+                (package, task) = self.pids_to_task[pid]
+                parent = self.tasks_to_iter[(package, task)]
+
+        if isinstance(event, bb.msg.Msg):
+            # Set a pretty icon for the message based on it's type.
+            if isinstance(event, bb.msg.MsgWarn):
+                icon = "dialog-warning"
+            elif isinstance(event, bb.msg.MsgErr):
+                icon = "dialog-error"
+            else:
+                icon = None
+
+            # Ignore the "Running task i of n .." messages
+            if (event._message.startswith ("Running task")):
+                return
+
+            # Add the message to the tree either at the top level if parent is
+            # None otherwise as a descendent of a task.
+            self.model.append (parent, 
+                               (event.__name__.split()[-1], # e.g. MsgWarn, MsgError
+                                package, 
+                                task,
+                                event._message,
+                                icon, 
+                                False))
+        elif isinstance(event, bb.build.TaskStarted):
+            (package, task) = (event._package, event._task)
+
+            # Save out this PID.
+            self.pids_to_task[pid] = (package,task)
+
+            # Check if we already have this package in our model. If so then
+            # that can be the parent for the task. Otherwise we create a new
+            # top level for the package.
+            if (self.tasks_to_iter.has_key ((package, None))):
+                parent = self.tasks_to_iter[(package, None)]
+            else:
+                parent = self.model.append (None, (None, 
+                                                   package, 
+                                                   None,
+                                                   "Package: %s" % (package), 
+                                                   None,
+                                                   False))
+                self.tasks_to_iter[(package, None)] = parent
+
+            # Because this parent package now has an active child mark it as
+            # such.
+            self.model.set(parent, self.model.COL_ICON, "gtk-execute")
+
+            # Add an entry in the model for this task
+            i = self.model.append (parent, (None, 
+                                            package, 
+                                            task,
+                                            "Task: %s" % (task), 
+                                            None,
+                                            False))
+
+            # Save out the iter so that we can find it when we have a message
+            # that we need to attach to a task.
+            self.tasks_to_iter[(package, task)] = i
+
+            # Mark this task as active.
+            self.model.set(i, self.model.COL_ICON, "gtk-execute")
+
+        elif isinstance(event, bb.build.Task):
+
+            if isinstance(event, bb.build.TaskFailed):
+                # Mark the task as failed
+                i = self.tasks_to_iter[(package, task)]
+                self.model.set(i, self.model.COL_ICON, "dialog-error")
+
+                # Mark the parent package as failed
+                i = self.tasks_to_iter[(package, None)]
+                self.model.set(i, self.model.COL_ICON, "dialog-error")
+            else:
+                # Mark the task as inactive
+                i = self.tasks_to_iter[(package, task)]
+                self.model.set(i, self.model.COL_ICON, None)
+
+                # Mark the parent package as inactive
+                i = self.tasks_to_iter[(package, None)]
+                self.model.set(i, self.model.COL_ICON, None)
+
+
+            # Clear the iters and the pids since when the task goes away the
+            # pid will no longer be used for messages
+            del self.tasks_to_iter[(package, task)]
+            del self.pids_to_task[pid]
+
+        elif isinstance(event, bb.event.BuildCompleted):
+            failures = int (event._failures)
+
+            # Emit the appropriate signal depending on the number of failures
+            if (failures > 1):
+                self.emit ("build-failed")
+            else:
+                self.emit ("build-succeeded")
+
+class RunningBuildTreeView (gtk.TreeView):
+    def __init__ (self):
+        gtk.TreeView.__init__ (self)
+
+        # The icon that indicates whether we're building or failed.
+        renderer = gtk.CellRendererPixbuf ()
+        col = gtk.TreeViewColumn ("Status", renderer)
+        col.add_attribute (renderer, "icon-name", 4)
+        self.append_column (col)
+
+        # The message of the build.
+        renderer = gtk.CellRendererText ()
+        col = gtk.TreeViewColumn ("Message", renderer, text=3)
+        self.append_column (col)
+
+
--- a/bitbake/lib/bb/ui/depexp.py
+++ b/bitbake/lib/bb/ui/depexp.py
@@ -0,0 +1,272 @@
+#
+# BitBake Graphical GTK based Dependency Explorer
+#
+# Copyright (C) 2007        Ross Burton
+# Copyright (C) 2007 - 2008 Richard Purdie
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import gobject
+import gtk
+import threading
+import xmlrpclib
+
+# Package Model
+(COL_PKG_NAME) = (0)
+
+# Dependency Model
+(TYPE_DEP, TYPE_RDEP) = (0, 1)
+(COL_DEP_TYPE, COL_DEP_PARENT, COL_DEP_PACKAGE) = (0, 1, 2)
+
+class PackageDepView(gtk.TreeView):
+    def __init__(self, model, dep_type, label):
+        gtk.TreeView.__init__(self)
+        self.current = None
+        self.dep_type = dep_type
+        self.filter_model = model.filter_new()
+        self.filter_model.set_visible_func(self._filter)
+        self.set_model(self.filter_model)
+        #self.connect("row-activated", self.on_package_activated, COL_DEP_PACKAGE)
+        self.append_column(gtk.TreeViewColumn(label, gtk.CellRendererText(), text=COL_DEP_PACKAGE))
+
+    def _filter(self, model, iter):
+        (this_type, package) = model.get(iter, COL_DEP_TYPE, COL_DEP_PARENT)
+        if this_type != self.dep_type: return False
+        return package == self.current
+
+    def set_current_package(self, package):
+        self.current = package
+        self.filter_model.refilter()
+
+class PackageReverseDepView(gtk.TreeView):
+    def __init__(self, model, label):
+        gtk.TreeView.__init__(self)
+        self.current = None
+        self.filter_model = model.filter_new()
+        self.filter_model.set_visible_func(self._filter)
+        self.set_model(self.filter_model)
+        self.append_column(gtk.TreeViewColumn(label, gtk.CellRendererText(), text=COL_DEP_PARENT))
+
+    def _filter(self, model, iter):
+        package = model.get_value(iter, COL_DEP_PACKAGE)
+        return package == self.current
+
+    def set_current_package(self, package):
+        self.current = package
+        self.filter_model.refilter()
+
+class DepExplorer(gtk.Window):
+    def __init__(self):
+        gtk.Window.__init__(self)
+        self.set_title("Dependency Explorer")
+        self.set_default_size(500, 500)
+        self.connect("delete-event", gtk.main_quit)
+
+        # Create the data models
+        self.pkg_model = gtk.ListStore(gobject.TYPE_STRING)
+        self.depends_model = gtk.ListStore(gobject.TYPE_INT, gobject.TYPE_STRING, gobject.TYPE_STRING)
+
+        pane = gtk.HPaned()
+        pane.set_position(250)
+        self.add(pane)
+
+        # The master list of packages
+        scrolled = gtk.ScrolledWindow()
+        scrolled.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+        scrolled.set_shadow_type(gtk.SHADOW_IN)
+        self.pkg_treeview = gtk.TreeView(self.pkg_model)
+        self.pkg_treeview.get_selection().connect("changed", self.on_cursor_changed)
+        self.pkg_treeview.append_column(gtk.TreeViewColumn("Package", gtk.CellRendererText(), text=COL_PKG_NAME))
+        pane.add1(scrolled)
+        scrolled.add(self.pkg_treeview)
+
+        box = gtk.VBox(homogeneous=True, spacing=4)
+
+        # Runtime Depends
+        scrolled = gtk.ScrolledWindow()
+        scrolled.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+        scrolled.set_shadow_type(gtk.SHADOW_IN)
+        self.rdep_treeview = PackageDepView(self.depends_model, TYPE_RDEP, "Runtime Depends")
+        self.rdep_treeview.connect("row-activated", self.on_package_activated, COL_DEP_PACKAGE)
+        scrolled.add(self.rdep_treeview)
+        box.add(scrolled)
+
+        # Build Depends
+        scrolled = gtk.ScrolledWindow()
+        scrolled.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+        scrolled.set_shadow_type(gtk.SHADOW_IN)
+        self.dep_treeview = PackageDepView(self.depends_model, TYPE_DEP, "Build Depends")
+        self.dep_treeview.connect("row-activated", self.on_package_activated, COL_DEP_PACKAGE)
+        scrolled.add(self.dep_treeview)
+        box.add(scrolled)
+        pane.add2(box)
+
+        # Reverse Depends
+        scrolled = gtk.ScrolledWindow()
+        scrolled.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+        scrolled.set_shadow_type(gtk.SHADOW_IN)
+        self.revdep_treeview = PackageReverseDepView(self.depends_model, "Reverse Depends")
+        self.revdep_treeview.connect("row-activated", self.on_package_activated, COL_DEP_PARENT)
+        scrolled.add(self.revdep_treeview)
+        box.add(scrolled)
+        pane.add2(box)
+
+        self.show_all()
+
+    def on_package_activated(self, treeview, path, column, data_col):
+        model = treeview.get_model()
+        package = model.get_value(model.get_iter(path), data_col)
+
+        pkg_path = []
+        def finder(model, path, iter, needle):
+            package = model.get_value(iter, COL_PKG_NAME)
+            if package == needle:
+                pkg_path.append(path)
+                return True
+            else:
+                return False
+        self.pkg_model.foreach(finder, package)
+        if pkg_path:
+            self.pkg_treeview.get_selection().select_path(pkg_path[0])
+            self.pkg_treeview.scroll_to_cell(pkg_path[0])
+
+    def on_cursor_changed(self, selection):
+        (model, it) = selection.get_selected()
+        if iter is None:
+            current_package = None
+        else:
+            current_package = model.get_value(it, COL_PKG_NAME)
+        self.rdep_treeview.set_current_package(current_package)
+        self.dep_treeview.set_current_package(current_package)
+        self.revdep_treeview.set_current_package(current_package)
+
+
+def parse(depgraph, pkg_model, depends_model):
+
+    for package in depgraph["pn"]:
+        pkg_model.set(pkg_model.append(), COL_PKG_NAME, package)
+
+    for package in depgraph["depends"]:
+        for depend in depgraph["depends"][package]:
+            depends_model.set (depends_model.append(),
+                              COL_DEP_TYPE, TYPE_DEP,
+                              COL_DEP_PARENT, package,
+                              COL_DEP_PACKAGE, depend)
+
+    for package in depgraph["rdepends-pn"]:
+        for rdepend in depgraph["rdepends-pn"][package]:
+            depends_model.set (depends_model.append(),
+                              COL_DEP_TYPE, TYPE_RDEP,
+                              COL_DEP_PARENT, package,
+                              COL_DEP_PACKAGE, rdepend)
+
+class ProgressBar(gtk.Window):
+    def __init__(self):
+
+        gtk.Window.__init__(self)
+        self.set_title("Parsing .bb files, please wait...")
+        self.set_default_size(500, 0)
+        self.connect("delete-event", gtk.main_quit)
+
+        self.progress = gtk.ProgressBar()
+        self.add(self.progress)
+        self.show_all()
+
+class gtkthread(threading.Thread):
+    quit = threading.Event()
+    def __init__(self, shutdown):
+        threading.Thread.__init__(self)
+        self.setDaemon(True)
+        self.shutdown = shutdown
+
+    def run(self):
+        gobject.threads_init()
+        gtk.gdk.threads_init()
+        gtk.main()
+        gtkthread.quit.set()
+
+def init(server, eventHandler):
+
+    try:
+        cmdline = server.runCommand(["getCmdLineAction"])
+        if not cmdline or cmdline[0] != "generateDotGraph":
+            print "This UI is only compatible with the -g option"
+            return
+        ret = server.runCommand(["generateDepTreeEvent", cmdline[1], cmdline[2]])
+        if ret != True:
+            print "Couldn't run command! %s" % ret
+            return
+    except xmlrpclib.Fault, x:
+        print "XMLRPC Fault getting commandline:\n %s" % x
+        return
+
+    shutdown = 0
+
+    gtkgui = gtkthread(shutdown)
+    gtkgui.start()
+
+    gtk.gdk.threads_enter()
+    pbar = ProgressBar()
+    dep = DepExplorer()
+    gtk.gdk.threads_leave()
+
+    while True:
+        try:
+            event = eventHandler.waitEvent(0.25)
+            if gtkthread.quit.isSet():
+                break
+
+            if event is None:
+                continue
+            if isinstance(event, bb.event.ParseProgress):
+                x = event.sofar
+                y = event.total
+                if x == y:
+                    print("\nParsing finished. %d cached, %d parsed, %d skipped, %d masked, %d errors." 
+                        % ( event.cached, event.parsed, event.skipped, event.masked, event.errors))
+                    pbar.hide()
+                gtk.gdk.threads_enter()
+                pbar.progress.set_fraction(float(x)/float(y))
+                pbar.progress.set_text("%d/%d (%2d %%)" % (x, y, x*100/y))
+                gtk.gdk.threads_leave()
+                continue
+
+            if isinstance(event, bb.event.DepTreeGenerated):
+                gtk.gdk.threads_enter()
+                parse(event._depgraph, dep.pkg_model, dep.depends_model)
+                gtk.gdk.threads_leave()
+
+            if isinstance(event, bb.command.CookerCommandCompleted):
+                continue
+            if isinstance(event, bb.command.CookerCommandFailed):
+                print "Command execution failed: %s" % event.error
+                break
+            if isinstance(event, bb.cooker.CookerExit):
+                break
+
+            continue
+
+        except KeyboardInterrupt:
+            if shutdown == 2:
+                print "\nThird Keyboard Interrupt, exit.\n"
+                break
+            if shutdown == 1:
+                print "\nSecond Keyboard Interrupt, stopping...\n"
+                server.runCommand(["stateStop"])
+            if shutdown == 0:
+                print "\nKeyboard Interrupt, closing down...\n"
+                server.runCommand(["stateShutdown"])
+            shutdown = shutdown + 1
+            pass
+
--- a/bitbake/lib/bb/ui/goggle.py
+++ b/bitbake/lib/bb/ui/goggle.py
@@ -0,0 +1,77 @@
+#
+# BitBake Graphical GTK User Interface
+#
+# Copyright (C) 2008        Intel Corporation
+#
+# Authored by Rob Bradford <rob@linux.intel.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import gobject
+import gtk
+import xmlrpclib
+from bb.ui.crumbs.runningbuild import RunningBuildTreeView, RunningBuild
+
+def event_handle_idle_func (eventHandler, build):
+
+  # Consume as many messages as we can in the time available to us
+  event = eventHandler.getEvent()
+  while event:
+      build.handle_event (event)
+      event = eventHandler.getEvent()
+
+  return True
+
+class MainWindow (gtk.Window):
+    def __init__ (self):
+        gtk.Window.__init__ (self, gtk.WINDOW_TOPLEVEL)
+
+        # Setup tree view and the scrolled window
+        scrolled_window = gtk.ScrolledWindow ()
+        self.add (scrolled_window)
+        self.cur_build_tv = RunningBuildTreeView()
+        scrolled_window.add (self.cur_build_tv)
+
+def init (server, eventHandler):
+    gobject.threads_init()
+    gtk.gdk.threads_init()
+
+    window = MainWindow ()
+    window.show_all ()
+
+    # Create the object for the current build
+    running_build = RunningBuild ()
+    window.cur_build_tv.set_model (running_build.model)
+    try:
+        cmdline = server.runCommand(["getCmdLineAction"])
+        print cmdline
+        if not cmdline:
+            return 1
+        ret = server.runCommand(cmdline)
+        if ret != True:
+            print "Couldn't get default commandline! %s" % ret
+            return 1
+    except xmlrpclib.Fault, x:
+        print "XMLRPC Fault getting commandline:\n %s" % x
+        return 1
+
+    # Use a timeout function for probing the event queue to find out if we
+    # have a message waiting for us.
+    gobject.timeout_add (200,
+                         event_handle_idle_func,
+                         eventHandler,
+                         running_build)
+
+    gtk.main()
+
--- a/bitbake/lib/bb/ui/knotty.py
+++ b/bitbake/lib/bb/ui/knotty.py
@@ -0,0 +1,182 @@
+#
+# BitBake (No)TTY UI Implementation
+#
+# Handling output to TTYs or files (no TTY)
+#
+# Copyright (C) 2006-2007 Richard Purdie
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import os
+
+import sys
+import itertools
+import xmlrpclib
+from bb import ui
+from bb.ui import uihelper
+
+
+parsespin = itertools.cycle( r'|/-\\' )
+
+def init(server, eventHandler):
+
+    # Get values of variables which control our output
+    includelogs = server.runCommand(["getVariable", "BBINCLUDELOGS"])
+    loglines = server.runCommand(["getVariable", "BBINCLUDELOGS_LINES"])
+
+    helper = uihelper.BBUIHelper()
+
+    try:
+        cmdline = server.runCommand(["getCmdLineAction"])
+        #print cmdline
+        if not cmdline:
+            return 1
+        ret = server.runCommand(cmdline)
+        if ret != True:
+            print "Couldn't get default commandline! %s" % ret
+            return 1
+    except xmlrpclib.Fault, x:
+        print "XMLRPC Fault getting commandline:\n %s" % x
+        return 1
+
+    shutdown = 0
+    return_value = 0
+    while True:
+        try:
+            event = eventHandler.waitEvent(0.25)
+            if event is None:
+                continue
+            #print event
+            helper.eventHandler(event)
+            if isinstance(event, bb.runqueue.runQueueExitWait):
+                if not shutdown:
+                    shutdown = 1
+            if shutdown and helper.needUpdate:
+                activetasks, failedtasks = helper.getTasks()
+                if activetasks:
+                    print "Waiting for %s active tasks to finish:" % len(activetasks)
+                    tasknum = 1
+                    for task in activetasks:
+                        print "%s: %s (pid %s)" % (tasknum, activetasks[task]["title"], task)
+                        tasknum = tasknum + 1
+
+            if isinstance(event, bb.msg.MsgPlain):
+                print event._message
+                continue
+            if isinstance(event, bb.msg.MsgDebug):
+                print 'DEBUG: ' + event._message
+                continue
+            if isinstance(event, bb.msg.MsgNote):
+                print 'NOTE: ' + event._message
+                continue
+            if isinstance(event, bb.msg.MsgWarn):
+                print 'WARNING: ' + event._message
+                continue
+            if isinstance(event, bb.msg.MsgError):
+                return_value = 1
+                print 'ERROR: ' + event._message
+                continue
+            if isinstance(event, bb.msg.MsgFatal):
+                return_value = 1
+                print 'FATAL: ' + event._message
+                break
+            if isinstance(event, bb.build.TaskFailed):
+                return_value = 1
+                logfile = event.logfile
+                if logfile:
+                    print "ERROR: Logfile of failure stored in: %s" % logfile
+                    if 1 or includelogs:
+                        print "Log data follows:"
+                        f = open(logfile, "r")
+                        lines = []
+                        while True:
+                            l = f.readline()
+                            if l == '':
+                                break
+                            l = l.rstrip()
+                            if loglines:
+                                lines.append(' | %s' % l)
+                                if len(lines) > int(loglines):
+                                    lines.pop(0)
+                            else:
+                                print '| %s' % l
+                        f.close()
+                        if lines:
+                            for line in lines:
+                                print line
+            if isinstance(event, bb.build.TaskBase):
+                print "NOTE: %s" % event._message
+                continue
+            if isinstance(event, bb.event.ParseProgress):
+                x = event.sofar
+                y = event.total
+                if os.isatty(sys.stdout.fileno()):
+                    sys.stdout.write("\rNOTE: Handling BitBake files: %s (%04d/%04d) [%2d %%]" % ( parsespin.next(), x, y, x*100/y ) )
+                    sys.stdout.flush()
+                else:
+                    if x == 1:
+                        sys.stdout.write("Parsing .bb files, please wait...")
+                        sys.stdout.flush()
+                    if x == y:
+                        sys.stdout.write("done.")
+                        sys.stdout.flush()
+                if x == y:
+                    print("\nParsing of %d .bb files complete (%d cached, %d parsed). %d targets, %d skipped, %d masked, %d errors." 
+                        % ( event.total, event.cached, event.parsed, event.virtuals, event.skipped, event.masked, event.errors))
+                continue
+
+            if isinstance(event, bb.command.CookerCommandCompleted):
+                break
+            if isinstance(event, bb.command.CookerCommandSetExitCode):
+                return_value = event.exitcode
+                continue
+            if isinstance(event, bb.command.CookerCommandFailed):
+                return_value = 1
+                print "Command execution failed: %s" % event.error
+                break
+            if isinstance(event, bb.cooker.CookerExit):
+                break
+
+            # ignore
+            if isinstance(event, bb.event.BuildStarted):
+                continue
+            if isinstance(event, bb.event.BuildCompleted):
+                continue
+            if isinstance(event, bb.event.MultipleProviders):
+                continue
+            if isinstance(event, bb.runqueue.runQueueEvent):
+                continue
+            if isinstance(event, bb.runqueue.runQueueExitWait):
+                continue
+            if isinstance(event, bb.event.StampUpdate):
+                continue
+            if isinstance(event, bb.event.ConfigParsed):
+                continue
+            if isinstance(event, bb.event.RecipeParsed):
+                continue
+            print "Unknown Event: %s" % event
+
+        except KeyboardInterrupt:
+            if shutdown == 2:
+                print "\nThird Keyboard Interrupt, exit.\n"
+                break
+            if shutdown == 1:
+                print "\nSecond Keyboard Interrupt, stopping...\n"
+                server.runCommand(["stateStop"])
+            if shutdown == 0:
+                print "\nKeyboard Interrupt, closing down...\n"
+                server.runCommand(["stateShutdown"])
+            shutdown = shutdown + 1
+            pass
+    return return_value
--- a/bitbake/lib/bb/ui/ncurses.py
+++ b/bitbake/lib/bb/ui/ncurses.py
@@ -0,0 +1,335 @@
+#
+# BitBake Curses UI Implementation
+#
+# Implements an ncurses frontend for the BitBake utility.
+#
+# Copyright (C) 2006 Michael 'Mickey' Lauer
+# Copyright (C) 2006-2007 Richard Purdie
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+"""
+    We have the following windows:
+
+        1.) Main Window: Shows what we are ultimately building and how far we are. Includes status bar
+        2.) Thread Activity Window: Shows one status line for every concurrent bitbake thread.
+        3.) Command Line Window: Contains an interactive command line where you can interact w/ Bitbake.
+
+    Basic window layout is like that:
+
+        |---------------------------------------------------------|
+        | <Main Window>               | <Thread Activity Window>  |
+        |                             | 0: foo do_compile complete|
+        | Building Gtk+-2.6.10        | 1: bar do_patch complete  |
+        | Status: 60%                 | ...                       |
+        |                             | ...                       |
+        |                             | ...                       |
+        |---------------------------------------------------------|
+        |<Command Line Window>                                    |
+        |>>> which virtual/kernel                                 |
+        |openzaurus-kernel                                        |
+        |>>> _                                                    |
+        |---------------------------------------------------------|
+
+"""
+
+import os, sys, curses, itertools, time
+import bb
+import xmlrpclib
+from bb import ui
+from bb.ui import uihelper
+
+parsespin = itertools.cycle( r'|/-\\' )
+
+X = 0
+Y = 1
+WIDTH = 2
+HEIGHT = 3
+
+MAXSTATUSLENGTH = 32
+
+class NCursesUI:
+    """
+    NCurses UI Class
+    """
+    class Window:
+        """Base Window Class"""
+        def __init__( self, x, y, width, height, fg=curses.COLOR_BLACK, bg=curses.COLOR_WHITE ):
+            self.win = curses.newwin( height, width, y, x )
+            self.dimensions = ( x, y, width, height )
+            """
+            if curses.has_colors():
+                color = 1
+                curses.init_pair( color, fg, bg )
+                self.win.bkgdset( ord(' '), curses.color_pair(color) )
+            else:
+                self.win.bkgdset( ord(' '), curses.A_BOLD )
+            """
+            self.erase()
+            self.setScrolling()
+            self.win.noutrefresh()
+
+        def erase( self ):
+            self.win.erase()
+
+        def setScrolling( self, b = True ):
+            self.win.scrollok( b )
+            self.win.idlok( b )
+
+        def setBoxed( self ):
+            self.boxed = True
+            self.win.box()
+            self.win.noutrefresh()
+
+        def setText( self, x, y, text, *args ):
+            self.win.addstr( y, x, text, *args )
+            self.win.noutrefresh()
+
+        def appendText( self, text, *args ):
+            self.win.addstr( text, *args )
+            self.win.noutrefresh()
+
+        def drawHline( self, y ):
+            self.win.hline( y, 0, curses.ACS_HLINE, self.dimensions[WIDTH] )
+            self.win.noutrefresh()
+
+    class DecoratedWindow( Window ):
+        """Base class for windows with a box and a title bar"""
+        def __init__( self, title, x, y, width, height, fg=curses.COLOR_BLACK, bg=curses.COLOR_WHITE ):
+            NCursesUI.Window.__init__( self, x+1, y+3, width-2, height-4, fg, bg )
+            self.decoration = NCursesUI.Window( x, y, width, height, fg, bg )
+            self.decoration.setBoxed()
+            self.decoration.win.hline( 2, 1, curses.ACS_HLINE, width-2 )
+            self.setTitle( title )
+
+        def setTitle( self, title ):
+            self.decoration.setText( 1, 1, title.center( self.dimensions[WIDTH]-2 ), curses.A_BOLD )
+
+    #-------------------------------------------------------------------------#
+#    class TitleWindow( Window ):
+    #-------------------------------------------------------------------------#
+#        """Title Window"""
+#        def __init__( self, x, y, width, height ):
+#            NCursesUI.Window.__init__( self, x, y, width, height )
+#            version = bb.__version__
+#            title = "BitBake %s" % version
+#            credit = "(C) 2003-2007 Team BitBake"
+#            #self.win.hline( 2, 1, curses.ACS_HLINE, width-2 )
+#            self.win.border()
+#            self.setText( 1, 1, title.center( self.dimensions[WIDTH]-2 ), curses.A_BOLD )
+#            self.setText( 1, 2, credit.center( self.dimensions[WIDTH]-2 ), curses.A_BOLD )
+
+    #-------------------------------------------------------------------------#
+    class ThreadActivityWindow( DecoratedWindow ):
+    #-------------------------------------------------------------------------#
+        """Thread Activity Window"""
+        def __init__( self, x, y, width, height ):
+            NCursesUI.DecoratedWindow.__init__( self, "Thread Activity", x, y, width, height )
+    
+        def setStatus( self, thread, text ):
+            line = "%02d: %s" % ( thread, text )
+            width = self.dimensions[WIDTH]
+            if ( len(line) > width ):
+                line = line[:width-3] + "..."
+            else:
+                line = line.ljust( width )
+            self.setText( 0, thread, line )
+
+    #-------------------------------------------------------------------------#
+    class MainWindow( DecoratedWindow ):
+    #-------------------------------------------------------------------------#
+        """Main Window"""
+        def __init__( self, x, y, width, height ):
+            self.StatusPosition = width - MAXSTATUSLENGTH
+            NCursesUI.DecoratedWindow.__init__( self, None, x, y, width, height )
+            curses.nl()
+
+        def setTitle( self, title ):
+            title = "BitBake %s" % bb.__version__
+            self.decoration.setText( 2, 1, title, curses.A_BOLD )
+            self.decoration.setText( self.StatusPosition - 8, 1, "Status:", curses.A_BOLD )
+
+        def setStatus(self, status):
+            while len(status) < MAXSTATUSLENGTH:
+                status = status + " "
+            self.decoration.setText( self.StatusPosition, 1, status, curses.A_BOLD )
+
+
+    #-------------------------------------------------------------------------#
+    class ShellOutputWindow( DecoratedWindow ):
+    #-------------------------------------------------------------------------#
+        """Interactive Command Line Output"""
+        def __init__( self, x, y, width, height ):
+            NCursesUI.DecoratedWindow.__init__( self, "Command Line Window", x, y, width, height )
+
+    #-------------------------------------------------------------------------#
+    class ShellInputWindow( Window ):
+    #-------------------------------------------------------------------------#
+        """Interactive Command Line Input"""
+        def __init__( self, x, y, width, height ):
+            NCursesUI.Window.__init__( self, x, y, width, height )
+
+# put that to the top again from curses.textpad import Textbox
+#            self.textbox = Textbox( self.win )
+#            t = threading.Thread()
+#            t.run = self.textbox.edit
+#            t.start()
+
+    #-------------------------------------------------------------------------#
+    def main(self, stdscr, server, eventHandler):
+    #-------------------------------------------------------------------------#
+        height, width = stdscr.getmaxyx()
+
+        # for now split it like that:
+        # MAIN_y + THREAD_y = 2/3 screen at the top
+        # MAIN_x = 2/3 left, THREAD_y = 1/3 right
+        # CLI_y = 1/3 of screen at the bottom
+        # CLI_x = full
+
+        main_left = 0
+        main_top = 0
+        main_height = ( height / 3 * 2 )
+        main_width = ( width / 3 ) * 2
+        clo_left = main_left
+        clo_top = main_top + main_height
+        clo_height = height - main_height - main_top - 1
+        clo_width = width
+        cli_left = main_left
+        cli_top = clo_top + clo_height
+        cli_height = 1
+        cli_width = width
+        thread_left = main_left + main_width
+        thread_top = main_top
+        thread_height = main_height
+        thread_width = width - main_width
+
+        #tw = self.TitleWindow( 0, 0, width, main_top )
+        mw = self.MainWindow( main_left, main_top, main_width, main_height )
+        taw = self.ThreadActivityWindow( thread_left, thread_top, thread_width, thread_height )
+        clo = self.ShellOutputWindow( clo_left, clo_top, clo_width, clo_height )
+        cli = self.ShellInputWindow( cli_left, cli_top, cli_width, cli_height )
+        cli.setText( 0, 0, "BB>" )
+
+        mw.setStatus("Idle")
+
+        helper = uihelper.BBUIHelper()
+        shutdown = 0
+   
+        try:
+            cmdline = server.runCommand(["getCmdLineAction"])
+            if not cmdline:
+                return
+            ret = server.runCommand(cmdline)
+            if ret != True:
+                print "Couldn't get default commandlind! %s" % ret
+                return
+        except xmlrpclib.Fault, x:
+            print "XMLRPC Fault getting commandline:\n %s" % x
+            return
+
+        exitflag = False
+        while not exitflag:
+            try:
+                event = eventHandler.waitEvent(0.25)
+                if not event:
+                    continue
+                helper.eventHandler(event)
+                #mw.appendText("%s\n" % event[0])
+                if isinstance(event, bb.build.Task):
+                    mw.appendText("NOTE: %s\n" % event._message)
+                if isinstance(event, bb.msg.MsgDebug):
+                    mw.appendText('DEBUG: ' + event._message + '\n')
+                if isinstance(event, bb.msg.MsgNote):
+                    mw.appendText('NOTE: ' + event._message + '\n')
+                if isinstance(event, bb.msg.MsgWarn):
+                    mw.appendText('WARNING: ' + event._message + '\n')
+                if isinstance(event, bb.msg.MsgError):
+                    mw.appendText('ERROR: ' + event._message + '\n')
+                if isinstance(event, bb.msg.MsgFatal):
+                    mw.appendText('FATAL: ' + event._message + '\n')
+                if isinstance(event, bb.event.ParseProgress):
+                    x = event.sofar
+                    y = event.total
+                    if x == y:
+                        mw.setStatus("Idle")
+                        mw.appendText("Parsing finished. %d cached, %d parsed, %d skipped, %d masked." 
+                                % ( event.cached, event.parsed, event.skipped, event.masked ))
+                    else:
+                        mw.setStatus("Parsing: %s (%04d/%04d) [%2d %%]" % ( parsespin.next(), x, y, x*100/y ) )
+#                if isinstance(event, bb.build.TaskFailed):
+#                    if event.logfile:
+#                        if data.getVar("BBINCLUDELOGS", d):
+#                            bb.msg.error(bb.msg.domain.Build, "log data follows (%s)" % logfile)
+#                            number_of_lines = data.getVar("BBINCLUDELOGS_LINES", d)
+#                            if number_of_lines:
+#                                os.system('tail -n%s %s' % (number_of_lines, logfile))
+#                            else:
+#                                f = open(logfile, "r")
+#                                while True:
+#                                    l = f.readline()
+#                                    if l == '':
+#                                        break
+#                                    l = l.rstrip()
+#                                    print '| %s' % l
+#                                f.close()
+#                        else:
+#                            bb.msg.error(bb.msg.domain.Build, "see log in %s" % logfile)
+
+                if isinstance(event, bb.command.CookerCommandCompleted):
+                    exitflag = True
+                if isinstance(event, bb.command.CookerCommandFailed):
+                    mw.appendText("Command execution failed: %s" % event.error)
+                    time.sleep(2)
+                    exitflag = True
+                if isinstance(event, bb.cooker.CookerExit):
+                    exitflag = True
+
+                if helper.needUpdate:
+                    activetasks, failedtasks = helper.getTasks()
+                    taw.erase()
+                    taw.setText(0, 0, "")
+                    if activetasks:
+                        taw.appendText("Active Tasks:\n")
+                        for task in activetasks:
+                            taw.appendText(task)
+                    if failedtasks:
+                        taw.appendText("Failed Tasks:\n")
+                        for task in failedtasks:
+                            taw.appendText(task)
+
+                curses.doupdate()
+            except KeyboardInterrupt:
+                if shutdown == 2:
+                    mw.appendText("Third Keyboard Interrupt, exit.\n")
+                    exitflag = True
+                if shutdown == 1:
+                    mw.appendText("Second Keyboard Interrupt, stopping...\n")
+                    server.runCommand(["stateStop"])
+                if shutdown == 0:
+                    mw.appendText("Keyboard Interrupt, closing down...\n")
+                    server.runCommand(["stateShutdown"])
+                shutdown = shutdown + 1
+                pass
+
+def init(server, eventHandler):
+    if not os.isatty(sys.stdout.fileno()):
+        print "FATAL: Unable to run 'ncurses' UI without a TTY."
+        return
+    ui = NCursesUI()
+    try:
+        curses.wrapper(ui.main, server, eventHandler)
+    except:
+        import traceback
+        traceback.print_exc()
+
--- a/bitbake/lib/bb/ui/puccho.py
+++ b/bitbake/lib/bb/ui/puccho.py
@@ -0,0 +1,425 @@
+#
+# BitBake Graphical GTK User Interface
+#
+# Copyright (C) 2008        Intel Corporation
+#
+# Authored by Rob Bradford <rob@linux.intel.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import gtk
+import gobject
+import gtk.glade
+import threading
+import urllib2
+import os
+
+from bb.ui.crumbs.buildmanager import BuildManager, BuildConfiguration
+from bb.ui.crumbs.buildmanager import BuildManagerTreeView
+
+from bb.ui.crumbs.runningbuild import RunningBuild, RunningBuildTreeView
+
+# The metadata loader is used by the BuildSetupDialog to download the
+# available options to populate the dialog
+class MetaDataLoader(gobject.GObject):
+    """ This class provides the mechanism for loading the metadata (the
+    fetching and parsing) from a given URL. The metadata encompasses details
+    on what machines are available. The distribution and images available for
+    the machine and the the uris to use for building the given machine."""
+    __gsignals__ = {
+        'success' : (gobject.SIGNAL_RUN_LAST, 
+                     gobject.TYPE_NONE,
+                     ()),
+        'error' : (gobject.SIGNAL_RUN_LAST,
+                   gobject.TYPE_NONE,
+                   (gobject.TYPE_STRING,))
+        }
+
+    # We use these little helper functions to ensure that we take the gdk lock
+    # when emitting the signal. These functions are called as idles (so that
+    # they happen in the gtk / main thread's main loop.
+    def emit_error_signal (self, remark):
+        gtk.gdk.threads_enter()
+        self.emit ("error", remark)
+        gtk.gdk.threads_leave()
+
+    def emit_success_signal (self):
+        gtk.gdk.threads_enter()
+        self.emit ("success")
+        gtk.gdk.threads_leave()
+
+    def __init__ (self):
+        gobject.GObject.__init__ (self)
+
+    class LoaderThread(threading.Thread):
+        """ This class provides an asynchronous loader for the metadata (by
+        using threads and signals). This is useful since the metadata may be
+        at a remote URL."""
+        class LoaderImportException (Exception):
+            pass
+
+        def __init__(self, loader, url):
+            threading.Thread.__init__ (self)
+            self.url = url
+            self.loader = loader
+
+        def run (self):
+            result = {}
+            try:
+                f = urllib2.urlopen (self.url)
+
+                # Parse the metadata format. The format is....
+                # <machine>;<default distro>|<distro>...;<default image>|<image>...;<type##url>|...
+                for line in f.readlines():
+                    components = line.split(";")
+                    if (len (components) < 4):
+                        raise MetaDataLoader.LoaderThread.LoaderImportException
+                    machine = components[0]
+                    distros = components[1].split("|")
+                    images = components[2].split("|")
+                    urls = components[3].split("|")
+
+                    result[machine] = (distros, images, urls)
+
+                # Create an object representing this *potential*
+                # configuration. It can become concrete if the machine, distro
+                # and image are all chosen in the UI
+                configuration = BuildConfiguration()
+                configuration.metadata_url = self.url
+                configuration.machine_options = result
+                self.loader.configuration = configuration
+
+                # Emit that we've actually got a configuration
+                gobject.idle_add (MetaDataLoader.emit_success_signal,
+                    self.loader)
+
+            except MetaDataLoader.LoaderThread.LoaderImportException, e:
+                gobject.idle_add (MetaDataLoader.emit_error_signal, self.loader,
+                    "Repository metadata corrupt")
+            except Exception, e:
+                gobject.idle_add (MetaDataLoader.emit_error_signal, self.loader,
+                    "Unable to download repository metadata")
+                print e
+
+    def try_fetch_from_url (self, url):
+        # Try and download the metadata. Firing a signal if successful
+        thread = MetaDataLoader.LoaderThread(self, url)
+        thread.start()
+
+class BuildSetupDialog (gtk.Dialog):
+    RESPONSE_BUILD = 1
+
+    # A little helper method that just sets the states on the widgets based on
+    # whether we've got good metadata or not.
+    def set_configurable (self, configurable):
+        if (self.configurable == configurable):
+            return
+
+        self.configurable = configurable
+        for widget in self.conf_widgets:
+            widget.set_sensitive (configurable)
+
+        if not configurable:
+            self.machine_combo.set_active (-1)
+            self.distribution_combo.set_active (-1)
+            self.image_combo.set_active (-1)
+
+    # GTK widget callbacks
+    def refresh_button_clicked (self, button):
+        # Refresh button clicked.
+
+        url = self.location_entry.get_chars (0, -1)
+        self.loader.try_fetch_from_url(url)
+
+    def repository_entry_editable_changed (self, entry):
+        if (len (entry.get_chars (0, -1)) > 0):
+            self.refresh_button.set_sensitive (True)
+        else:
+            self.refresh_button.set_sensitive (False)
+            self.clear_status_message()
+
+        # If we were previously configurable we are no longer since the
+        # location entry has been changed
+        self.set_configurable (False)
+
+    def machine_combo_changed (self, combobox):
+        active_iter = combobox.get_active_iter()
+
+        if not active_iter:
+            return
+
+        model = combobox.get_model()
+
+        if model:
+            chosen_machine = model.get (active_iter, 0)[0]
+
+        (distros_model, images_model) = \
+            self.loader.configuration.get_distro_and_images_models (chosen_machine)
+
+        self.distribution_combo.set_model (distros_model)
+        self.image_combo.set_model (images_model)
+
+    # Callbacks from the loader
+    def loader_success_cb (self, loader):
+        self.status_image.set_from_icon_name ("info",
+            gtk.ICON_SIZE_BUTTON)
+        self.status_image.show()
+        self.status_label.set_label ("Repository metadata successfully downloaded")
+
+        # Set the models on the combo boxes based on the models generated from
+        # the configuration that the loader has created
+
+        # We just need to set the machine here, that then determines the
+        # distro and image options. Cunning huh? :-)
+
+        self.configuration = self.loader.configuration
+        model = self.configuration.get_machines_model ()
+        self.machine_combo.set_model (model)
+
+        self.set_configurable (True)
+
+    def loader_error_cb (self, loader, message):
+        self.status_image.set_from_icon_name ("error",
+            gtk.ICON_SIZE_BUTTON)
+        self.status_image.show()
+        self.status_label.set_text ("Error downloading repository metadata")
+        for widget in self.conf_widgets:
+            widget.set_sensitive (False)
+
+    def clear_status_message (self):
+        self.status_image.hide()
+        self.status_label.set_label (
+            """<i>Enter the repository location and press _Refresh</i>""")
+
+    def __init__ (self):
+        gtk.Dialog.__init__ (self)
+
+        # Cancel
+        self.add_button (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)
+
+        # Build
+        button = gtk.Button ("_Build", None, True)
+        image = gtk.Image ()
+        image.set_from_stock (gtk.STOCK_EXECUTE,gtk.ICON_SIZE_BUTTON)
+        button.set_image (image)
+        self.add_action_widget (button, BuildSetupDialog.RESPONSE_BUILD)
+        button.show_all ()
+
+        # Pull in *just* the table from the Glade XML data.
+        gxml = gtk.glade.XML (os.path.dirname(__file__) + "/crumbs/puccho.glade",
+            root = "build_table")
+        table = gxml.get_widget ("build_table")
+        self.vbox.pack_start (table, True, False, 0)
+
+        # Grab all the widgets that we need to turn on/off when we refresh...
+        self.conf_widgets = []
+        self.conf_widgets += [gxml.get_widget ("machine_label")]
+        self.conf_widgets += [gxml.get_widget ("distribution_label")]
+        self.conf_widgets += [gxml.get_widget ("image_label")]
+        self.conf_widgets += [gxml.get_widget ("machine_combo")]
+        self.conf_widgets += [gxml.get_widget ("distribution_combo")]
+        self.conf_widgets += [gxml.get_widget ("image_combo")]
+
+        # Grab the status widgets
+        self.status_image = gxml.get_widget ("status_image")
+        self.status_label = gxml.get_widget ("status_label")
+
+        # Grab the refresh button and connect to the clicked signal
+        self.refresh_button = gxml.get_widget ("refresh_button")
+        self.refresh_button.connect ("clicked", self.refresh_button_clicked)
+
+        # Grab the location entry and connect to editable::changed
+        self.location_entry = gxml.get_widget ("location_entry")
+        self.location_entry.connect ("changed",
+            self.repository_entry_editable_changed)
+
+        # Grab the machine combo and hook onto the changed signal. This then
+        # allows us to populate the distro and image combos
+        self.machine_combo = gxml.get_widget ("machine_combo")
+        self.machine_combo.connect ("changed", self.machine_combo_changed)
+
+        # Setup the combo
+        cell = gtk.CellRendererText()
+        self.machine_combo.pack_start(cell, True)
+        self.machine_combo.add_attribute(cell, 'text', 0)
+
+        # Grab the distro and image combos. We need these to populate with
+        # models once the machine is chosen
+        self.distribution_combo = gxml.get_widget ("distribution_combo")
+        cell = gtk.CellRendererText()
+        self.distribution_combo.pack_start(cell, True)
+        self.distribution_combo.add_attribute(cell, 'text', 0)
+
+        self.image_combo = gxml.get_widget ("image_combo")
+        cell = gtk.CellRendererText()
+        self.image_combo.pack_start(cell, True)
+        self.image_combo.add_attribute(cell, 'text', 0)
+
+        # Put the default descriptive text in the status box
+        self.clear_status_message()
+
+        # Mark as non-configurable, this is just greys out the widgets the
+        # user can't yet use
+        self.configurable = False
+        self.set_configurable(False)
+
+        # Show the table
+        table.show_all ()
+
+        # The loader and some signals connected to it to update the status
+        # area
+        self.loader = MetaDataLoader()
+        self.loader.connect ("success", self.loader_success_cb)
+        self.loader.connect ("error", self.loader_error_cb)
+
+    def update_configuration (self):
+        """ A poorly named function but it updates the internal configuration
+        from the widgets. This can make that configuration concrete and can
+        thus be used for building """
+        # Extract the chosen machine from the combo
+        model = self.machine_combo.get_model()
+        active_iter = self.machine_combo.get_active_iter()
+        if (active_iter):
+            self.configuration.machine = model.get(active_iter, 0)[0]
+
+        # Extract the chosen distro from the combo 
+        model = self.distribution_combo.get_model()
+        active_iter = self.distribution_combo.get_active_iter()
+        if (active_iter):
+            self.configuration.distro = model.get(active_iter, 0)[0]
+
+        # Extract the chosen image from the combo
+        model = self.image_combo.get_model()
+        active_iter = self.image_combo.get_active_iter()
+        if (active_iter):
+            self.configuration.image = model.get(active_iter, 0)[0]
+
+# This function operates to pull events out from the event queue and then push
+# them into the RunningBuild (which then drives the RunningBuild which then
+# pushes through and updates the progress tree view.)
+#
+# TODO: Should be a method on the RunningBuild class
+def event_handle_timeout (eventHandler, build):
+  # Consume as many messages as we can ...
+  event = eventHandler.getEvent()
+  while event:
+      build.handle_event (event)
+      event = eventHandler.getEvent()
+  return True
+
+class MainWindow (gtk.Window):
+
+  # Callback that gets fired when the user hits a button in the
+  # BuildSetupDialog.
+  def build_dialog_box_response_cb (self, dialog, response_id):
+      conf = None
+      if (response_id == BuildSetupDialog.RESPONSE_BUILD):
+          dialog.update_configuration()
+          print dialog.configuration.machine, dialog.configuration.distro, \
+              dialog.configuration.image
+          conf = dialog.configuration
+
+      dialog.destroy()
+
+      if conf:
+          self.manager.do_build (conf)
+
+  def build_button_clicked_cb (self, button):
+    dialog = BuildSetupDialog ()
+
+    # For some unknown reason Dialog.run causes nice little deadlocks ... :-(
+    dialog.connect ("response", self.build_dialog_box_response_cb)
+    dialog.show()
+
+  def __init__ (self):
+      gtk.Window.__init__ (self)
+
+      # Pull in *just* the main vbox from the Glade XML data and then pack
+      # that inside the window
+      gxml = gtk.glade.XML (os.path.dirname(__file__) + "/crumbs/puccho.glade",
+          root = "main_window_vbox")
+      vbox = gxml.get_widget ("main_window_vbox")
+      self.add (vbox)
+
+      # Create the tree views for the build manager view and the progress view
+      self.build_manager_view = BuildManagerTreeView()
+      self.running_build_view = RunningBuildTreeView()
+
+      # Grab the scrolled windows that we put the tree views into
+      self.results_scrolledwindow = gxml.get_widget ("results_scrolledwindow")
+      self.progress_scrolledwindow = gxml.get_widget ("progress_scrolledwindow")
+
+      # Put the tree views inside ...
+      self.results_scrolledwindow.add (self.build_manager_view)
+      self.progress_scrolledwindow.add (self.running_build_view)
+
+      # Hook up the build button...
+      self.build_button = gxml.get_widget ("main_toolbutton_build")
+      self.build_button.connect ("clicked", self.build_button_clicked_cb)
+
+# I'm not very happy about the current ownership of the RunningBuild. I have
+# my suspicions that this object should be held by the BuildManager since we
+# care about the signals in the manager
+
+def running_build_succeeded_cb (running_build, manager):
+    # Notify the manager that a build has succeeded. This is necessary as part
+    # of the 'hack' that we use for making the row in the model / view
+    # representing the ongoing build change into a row representing the
+    # completed build. Since we know only one build can be running a time then
+    # we can handle this.
+
+    # FIXME: Refactor all this so that the RunningBuild is owned by the
+    # BuildManager. It can then hook onto the signals directly and drive
+    # interesting things it cares about.
+    manager.notify_build_succeeded ()
+    print "build succeeded"
+
+def running_build_failed_cb (running_build, manager):
+    # As above
+    print "build failed"
+    manager.notify_build_failed ()
+
+def init (server, eventHandler):
+    # Initialise threading...
+    gobject.threads_init()
+    gtk.gdk.threads_init()
+
+    main_window = MainWindow ()
+    main_window.show_all ()
+
+    # Set up the build manager stuff in general
+    builds_dir = os.path.join (os.getcwd(),  "results")
+    manager = BuildManager (server, builds_dir)
+    main_window.build_manager_view.set_model (manager.model)
+
+    # Do the running build setup
+    running_build = RunningBuild ()
+    main_window.running_build_view.set_model (running_build.model)
+    running_build.connect ("build-succeeded", running_build_succeeded_cb,
+        manager)
+    running_build.connect ("build-failed", running_build_failed_cb, manager)
+
+    # We need to save the manager into the MainWindow so that the toolbar
+    # button can use it.
+    # FIXME: Refactor ?
+    main_window.manager = manager
+
+    # Use a timeout function for probing the event queue to find out if we
+    # have a message waiting for us.
+    gobject.timeout_add (200,
+                         event_handle_timeout,
+                         eventHandler,
+                         running_build)
+
+    gtk.main()
--- a/bitbake/lib/bb/ui/uievent.py
+++ b/bitbake/lib/bb/ui/uievent.py
@@ -0,0 +1,125 @@
+# ex:ts=4:sw=4:sts=4:et
+# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
+#
+# Copyright (C) 2006 - 2007  Michael 'Mickey' Lauer
+# Copyright (C) 2006 - 2007  Richard Purdie
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+
+"""
+Use this class to fork off a thread to recieve event callbacks from the bitbake 
+server and queue them for the UI to process. This process must be used to avoid
+client/server deadlocks.
+"""
+
+import socket, threading, pickle
+from SimpleXMLRPCServer import SimpleXMLRPCServer, SimpleXMLRPCRequestHandler
+
+class BBUIEventQueue:
+    def __init__(self, BBServer):
+
+        self.eventQueue = []
+        self.eventQueueLock = threading.Lock()
+        self.eventQueueNotify = threading.Event()
+
+        self.BBServer = BBServer
+
+        self.t = threading.Thread()
+        self.t.setDaemon(True)
+        self.t.run = self.startCallbackHandler
+        self.t.start()
+
+    def getEvent(self):
+
+        self.eventQueueLock.acquire()
+
+        if len(self.eventQueue) == 0:
+            self.eventQueueLock.release()
+            return None
+
+        item = self.eventQueue.pop(0)
+
+        if len(self.eventQueue) == 0:
+            self.eventQueueNotify.clear()
+
+        self.eventQueueLock.release()
+        return item
+
+    def waitEvent(self, delay):
+        self.eventQueueNotify.wait(delay)
+        return self.getEvent()
+
+    def queue_event(self, event):
+        self.eventQueueLock.acquire()
+        self.eventQueue.append(pickle.loads(event))
+        self.eventQueueNotify.set()
+        self.eventQueueLock.release()
+
+    def startCallbackHandler(self):
+
+        server = UIXMLRPCServer()
+        self.host, self.port = server.socket.getsockname()
+
+        server.register_function( self.system_quit, "event.quit" )
+        server.register_function( self.queue_event, "event.send" )
+        server.socket.settimeout(1)
+
+        self.EventHandle = self.BBServer.registerEventHandler(self.host, self.port)
+
+        self.server = server
+        while not server.quit:
+            server.handle_request()
+        server.server_close()
+
+    def system_quit( self ):
+        """
+        Shut down the callback thread
+        """
+        try:
+            self.BBServer.unregisterEventHandler(self.EventHandle)
+        except:
+            pass
+        self.server.quit = True
+
+class UIXMLRPCServer (SimpleXMLRPCServer):
+
+    def __init__( self, interface = ("localhost", 0) ):
+        self.quit = False
+        SimpleXMLRPCServer.__init__( self,
+                                    interface,
+                                    requestHandler=SimpleXMLRPCRequestHandler,
+                                    logRequests=False, allow_none=True)
+
+    def get_request(self):
+        while not self.quit:
+            try:
+                sock, addr = self.socket.accept()
+                sock.settimeout(1)
+                return (sock, addr)
+            except socket.timeout:
+                pass
+        return (None,None)
+
+    def close_request(self, request):
+        if request is None:
+            return
+        SimpleXMLRPCServer.close_request(self, request)
+        
+    def process_request(self, request, client_address):
+        if request is None:
+            return
+        SimpleXMLRPCServer.process_request(self, request, client_address)
+
+
--- a/bitbake/lib/bb/ui/uihelper.py
+++ b/bitbake/lib/bb/ui/uihelper.py
@@ -0,0 +1,50 @@
+# ex:ts=4:sw=4:sts=4:et
+# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
+#
+# Copyright (C) 2006 - 2007  Michael 'Mickey' Lauer
+# Copyright (C) 2006 - 2007  Richard Purdie
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+class BBUIHelper:
+    def __init__(self):
+        self.needUpdate = False
+        self.running_tasks = {}
+        self.failed_tasks = []
+
+    def eventHandler(self, event):
+        if isinstance(event, bb.build.TaskStarted):
+            self.running_tasks[event.pid] = { 'title' : "%s %s" % (event._package, event._task) }
+            self.needUpdate = True
+        if isinstance(event, bb.build.TaskSucceeded):
+            del self.running_tasks[event.pid]
+            self.needUpdate = True
+        if isinstance(event, bb.build.TaskFailed):
+            del self.running_tasks[event.pid]
+            self.failed_tasks.append( { 'title' : "%s %s" % (event._package, event._task)})
+            self.needUpdate = True
+
+        # Add runqueue event handling
+        #if isinstance(event, bb.runqueue.runQueueTaskCompleted):
+        #    a = 1
+        #if isinstance(event, bb.runqueue.runQueueTaskStarted):
+        #    a = 1
+        #if isinstance(event, bb.runqueue.runQueueTaskFailed):
+        #    a = 1
+        #if isinstance(event, bb.runqueue.runQueueExitWait):
+        #    a = 1
+
+    def getTasks(self):
+        self.needUpdate = False
+        return (self.running_tasks, self.failed_tasks)
--- a/bitbake/lib/bb/utils.py
+++ b/bitbake/lib/bb/utils.py
@@ -19,32 +19,35 @@ BitBake Utility Functions
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

-digits = "0123456789"
-ascii_letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+separators = ".-"

-import re, fcntl, os
+import re, fcntl, os, types, bb, string, stat, shutil
+from commands import getstatusoutput

 def explode_version(s):
    r = []
    alpha_regexp = re.compile('^([a-zA-Z]+)(.*)$')
    numeric_regexp = re.compile('^(\d+)(.*)$')
    while (s != ''):
-        if s[0] in digits:
+        if s[0] in string.digits:
            m = numeric_regexp.match(s)
            r.append(int(m.group(1)))
            s = m.group(2)
            continue
-        if s[0] in ascii_letters:
+        if s[0] in string.letters:
            m = alpha_regexp.match(s)
            r.append(m.group(1))
            s = m.group(2)
            continue
+        r.append(s[0])
        s = s[1:]
    return r

 def vercmp_part(a, b):
    va = explode_version(a)
    vb = explode_version(b)
+    sa = False
+    sb = False
    while True:
        if va == []:
            ca = None
@@ -56,6 +59,16 @@ def vercmp_part(a, b):
            cb = vb.pop(0)
        if ca == None and cb == None:
            return 0
+
+        if type(ca) is types.StringType:
+            sa = ca in separators
+        if type(cb) is types.StringType:
+            sb = cb in separators
+        if sa and not sb:
+            return -1
+        if not sa and sb:
+            return 1
+
        if ca > cb:
            return 1
        if ca < cb:
@@ -85,18 +98,45 @@ def explode_deps(s):
    for i in l:
        if i[0] == '(':
            flag = True
-            j = []
-        if flag:
-            j.append(i)
-        else:
+            #j = []
+        if not flag:
            r.append(i)
+        #else:
+        #    j.append(i)
        if flag and i.endswith(')'):
            flag = False
            # Ignore version
            #r[-1] += ' ' + ' '.join(j)
    return r

+def explode_dep_versions(s):
+    """
+    Take an RDEPENDS style string of format:
+    "DEPEND1 (optional version) DEPEND2 (optional version) ..."
+    and return a dictonary of dependencies and versions.
+    """
+    r = {}
+    l = s.split()
+    lastdep = None
+    lastver = ""
+    inversion = False
+    for i in l:
+        if i[0] == '(':
+            inversion = True
+            lastver = i[1:] or ""
+            #j = []
+        elif inversion and i.endswith(')'):
+            inversion = False
+            lastver = lastver + " " + (i[:-1] or "")
+            r[lastdep] = lastver
+        elif not inversion:
+            r[i] = None
+            lastdep = i
+            lastver = ""
+        elif inversion:
+            lastver = lastver + " " + i

+    return r

 def _print_trace(body, line):
    """
@@ -124,8 +164,8 @@ def better_compile(text, file, realfile):

        # split the text into lines again
        body = text.split('\n')
-        bb.msg.error(bb.msg.domain.Util, "Error in compiling: ", realfile)
-        bb.msg.error(bb.msg.domain.Util, "The lines resulting into this error were:")
+        bb.msg.error(bb.msg.domain.Util, "Error in compiling python function in: ", realfile)
+        bb.msg.error(bb.msg.domain.Util, "The lines leading to this error were:")
        bb.msg.error(bb.msg.domain.Util, "\t%d:%s:'%s'" % (e.lineno, e.__class__.__name__, body[e.lineno-1]))

        _print_trace(body, e.lineno)
@@ -149,7 +189,7 @@ def better_exec(code, context, text, realfile):
            raise

        # print the Header of the Error Message
-        bb.msg.error(bb.msg.domain.Util, "Error in executing: ", realfile)
+        bb.msg.error(bb.msg.domain.Util, "Error in executing python function in: %s" % realfile)
        bb.msg.error(bb.msg.domain.Util, "Exception:%s Message:%s" % (t,value) )

        # let us find the line number now
@@ -208,6 +248,12 @@ def lockfile(name):
    Use the file fn as a lock file, return when the lock has been acquired.
    Returns a variable to pass to unlockfile().
    """
+    path = os.path.dirname(name)
+    if not os.path.isdir(path):
+        import bb, sys
+        bb.msg.error(bb.msg.domain.Util, "Error, lockfile path does not exist!: %s" % path)
+        sys.exit(1)
+
    while True:
        # If we leave the lockfiles lying around there is no problem
        # but we should clean up after ourselves. This gives potential
@@ -219,15 +265,18 @@ def lockfile(name):
        # This implementation is unfair since the last person to request the 
        # lock is the most likely to win it.

-        lf = open(name, "a+")
-        fcntl.flock(lf.fileno(), fcntl.LOCK_EX)
-        statinfo = os.fstat(lf.fileno())
-        if os.path.exists(lf.name):
-           statinfo2 = os.stat(lf.name)
-           if statinfo.st_ino == statinfo2.st_ino:
-               return lf
-        # File no longer exists or changed, retry
-        lf.close
+        try:
+            lf = open(name, "a+")
+            fcntl.flock(lf.fileno(), fcntl.LOCK_EX)
+            statinfo = os.fstat(lf.fileno())
+            if os.path.exists(lf.name):
+               statinfo2 = os.stat(lf.name)
+               if statinfo.st_ino == statinfo2.st_ino:
+                   return lf
+            # File no longer exists or changed, retry
+            lf.close
+        except Exception, e:
+            continue

 def unlockfile(lf):
    """
@@ -237,3 +286,331 @@ def unlockfile(lf):
    fcntl.flock(lf.fileno(), fcntl.LOCK_UN)
    lf.close

+def md5_file(filename):
+    """
+    Return the hex string representation of the MD5 checksum of filename.
+    """
+    try:
+        import hashlib
+        m = hashlib.md5()
+    except ImportError:
+        import md5
+        m = md5.new()
+    
+    for line in open(filename):
+        m.update(line)
+    return m.hexdigest()
+
+def sha256_file(filename):
+    """
+    Return the hex string representation of the 256-bit SHA checksum of
+    filename.  On Python 2.4 this will return None, so callers will need to
+    handle that by either skipping SHA checks, or running a standalone sha256sum
+    binary.
+    """
+    try:
+        import hashlib
+    except ImportError:
+        return None
+
+    s = hashlib.sha256()
+    for line in open(filename):
+        s.update(line)
+    return s.hexdigest()
+
+def preserved_envvars_list():
+    return [
+        'BBPATH',
+        'BB_PRESERVE_ENV',
+        'BB_ENV_WHITELIST',
+        'BB_ENV_EXTRAWHITE',
+        'COLORTERM',
+        'DBUS_SESSION_BUS_ADDRESS',
+        'DESKTOP_SESSION',
+        'DESKTOP_STARTUP_ID',
+        'DISPLAY',
+        'GNOME_KEYRING_PID',
+        'GNOME_KEYRING_SOCKET',
+        'GPG_AGENT_INFO',
+        'GTK_RC_FILES',
+        'HOME',
+        'LANG',
+        'LOGNAME',
+        'PATH',
+        'PWD',
+        'SESSION_MANAGER',
+        'SHELL',
+        'SSH_AUTH_SOCK',
+        'TERM',
+        'USER',
+        'USERNAME',
+        '_',
+        'XAUTHORITY',
+        'XDG_DATA_DIRS',
+        'XDG_SESSION_COOKIE',
+    ]
+
+def filter_environment(good_vars):
+    """
+    Create a pristine environment for bitbake. This will remove variables that
+    are not known and may influence the build in a negative way.
+    """
+
+    import bb
+
+    removed_vars = []
+    for key in os.environ.keys():
+        if key in good_vars:
+            continue
+        
+        removed_vars.append(key)
+        os.unsetenv(key)
+        del os.environ[key]
+
+    if len(removed_vars):
+        bb.debug(1, "Removed the following variables from the environment:", ",".join(removed_vars))
+
+    return removed_vars
+
+def clean_environment():
+    """
+    Clean up any spurious environment variables. This will remove any
+    variables the user hasn't chose to preserve.
+    """
+    if 'BB_PRESERVE_ENV' not in os.environ:
+        if 'BB_ENV_WHITELIST' in os.environ:
+            good_vars = os.environ['BB_ENV_WHITELIST'].split()
+        else:
+            good_vars = preserved_envvars_list()
+        if 'BB_ENV_EXTRAWHITE' in os.environ:
+            good_vars.extend(os.environ['BB_ENV_EXTRAWHITE'].split())
+        filter_environment(good_vars)
+
+def empty_environment():
+    """
+    Remove all variables from the environment.
+    """
+    for s in os.environ.keys():
+        os.unsetenv(s)
+        del os.environ[s]
+
+def build_environment(d):
+    """
+    Build an environment from all exported variables.
+    """
+    import bb
+    for var in bb.data.keys(d):
+        export = bb.data.getVarFlag(var, "export", d)
+        if export:
+            os.environ[var] = bb.data.getVar(var, d, True) or ""
+
+def prunedir(topdir):
+    # Delete everything reachable from the directory named in 'topdir'.
+    # CAUTION:  This is dangerous!
+    for root, dirs, files in os.walk(topdir, topdown=False):
+        for name in files:
+            os.remove(os.path.join(root, name))
+        for name in dirs:
+            if os.path.islink(os.path.join(root, name)):
+                os.remove(os.path.join(root, name))
+            else:
+                os.rmdir(os.path.join(root, name))
+    os.rmdir(topdir)
+
+#
+# Could also use return re.compile("(%s)" % "|".join(map(re.escape, suffixes))).sub(lambda mo: "", var)
+# but thats possibly insane and suffixes is probably going to be small
+#
+def prune_suffix(var, suffixes, d):
+    # See if var ends with any of the suffixes listed and 
+    # remove it if found
+    for suffix in suffixes:
+        if var.endswith(suffix):
+            return var.replace(suffix, "")
+    return var
+
+def mkdirhier(dir):
+    """Create a directory like 'mkdir -p', but does not complain if
+    directory already exists like os.makedirs
+    """
+
+    bb.debug(3, "mkdirhier(%s)" % dir)
+    try:
+        os.makedirs(dir)
+        bb.debug(2, "created " + dir)
+    except OSError, e:
+        if e.errno != 17: raise e
+
+import stat
+
+def movefile(src,dest,newmtime=None,sstat=None):
+    """Moves a file from src to dest, preserving all permissions and
+    attributes; mtime will be preserved even when moving across
+    filesystems.  Returns true on success and false on failure. Move is
+    atomic.
+    """
+
+    #print "movefile("+src+","+dest+","+str(newmtime)+","+str(sstat)+")"
+    try:
+        if not sstat:
+            sstat=os.lstat(src)
+    except Exception, e:
+        print "movefile: Stating source file failed...", e
+        return None
+
+    destexists=1
+    try:
+        dstat=os.lstat(dest)
+    except:
+        dstat=os.lstat(os.path.dirname(dest))
+        destexists=0
+
+    if destexists:
+        if stat.S_ISLNK(dstat[stat.ST_MODE]):
+            try:
+                os.unlink(dest)
+                destexists=0
+            except Exception, e:
+                pass
+
+    if stat.S_ISLNK(sstat[stat.ST_MODE]):
+        try:
+            target=os.readlink(src)
+            if destexists and not stat.S_ISDIR(dstat[stat.ST_MODE]):
+                os.unlink(dest)
+            os.symlink(target,dest)
+            #os.lchown(dest,sstat[stat.ST_UID],sstat[stat.ST_GID])
+            os.unlink(src)
+            return os.lstat(dest)
+        except Exception, e:
+            print "movefile: failed to properly create symlink:", dest, "->", target, e
+            return None
+
+    renamefailed=1
+    if sstat[stat.ST_DEV]==dstat[stat.ST_DEV]:
+        try:
+            ret=os.rename(src,dest)
+            renamefailed=0
+        except Exception, e:
+            import errno
+            if e[0]!=errno.EXDEV:
+                # Some random error.
+                print "movefile: Failed to move", src, "to", dest, e
+                return None
+            # Invalid cross-device-link 'bind' mounted or actually Cross-Device
+
+    if renamefailed:
+        didcopy=0
+        if stat.S_ISREG(sstat[stat.ST_MODE]):
+            try: # For safety copy then move it over.
+                shutil.copyfile(src,dest+"#new")
+                os.rename(dest+"#new",dest)
+                didcopy=1
+            except Exception, e:
+                print 'movefile: copy', src, '->', dest, 'failed.', e
+                return None
+        else:
+            #we don't yet handle special, so we need to fall back to /bin/mv
+            a=getstatusoutput("/bin/mv -f "+"'"+src+"' '"+dest+"'")
+            if a[0]!=0:
+                print "movefile: Failed to move special file:" + src + "' to '" + dest + "'", a
+                return None # failure
+        try:
+            if didcopy:
+                os.lchown(dest,sstat[stat.ST_UID],sstat[stat.ST_GID])
+                os.chmod(dest, stat.S_IMODE(sstat[stat.ST_MODE])) # Sticky is reset on chown
+                os.unlink(src)
+        except Exception, e:
+            print "movefile: Failed to chown/chmod/unlink", dest, e
+            return None
+
+    if newmtime:
+        os.utime(dest,(newmtime,newmtime))
+    else:
+        os.utime(dest, (sstat[stat.ST_ATIME], sstat[stat.ST_MTIME]))
+        newmtime=sstat[stat.ST_MTIME]
+    return newmtime
+
+def copyfile(src,dest,newmtime=None,sstat=None):
+    """
+    Copies a file from src to dest, preserving all permissions and
+    attributes; mtime will be preserved even when moving across
+    filesystems.  Returns true on success and false on failure.
+    """
+    #print "copyfile("+src+","+dest+","+str(newmtime)+","+str(sstat)+")"
+    try:
+        if not sstat:
+            sstat=os.lstat(src)
+    except Exception, e:
+        print "copyfile: Stating source file failed...", e
+        return False
+
+    destexists=1
+    try:
+        dstat=os.lstat(dest)
+    except:
+        dstat=os.lstat(os.path.dirname(dest))
+        destexists=0
+
+    if destexists:
+        if stat.S_ISLNK(dstat[stat.ST_MODE]):
+            try:
+                os.unlink(dest)
+                destexists=0
+            except Exception, e:
+                pass
+
+    if stat.S_ISLNK(sstat[stat.ST_MODE]):
+        try:
+            target=os.readlink(src)
+            if destexists and not stat.S_ISDIR(dstat[stat.ST_MODE]):
+                os.unlink(dest)
+            os.symlink(target,dest)
+            #os.lchown(dest,sstat[stat.ST_UID],sstat[stat.ST_GID])
+            return os.lstat(dest)
+        except Exception, e:
+            print "copyfile: failed to properly create symlink:", dest, "->", target, e
+            return False
+
+    if stat.S_ISREG(sstat[stat.ST_MODE]):
+            try: # For safety copy then move it over.
+                shutil.copyfile(src,dest+"#new")
+                os.rename(dest+"#new",dest)
+            except Exception, e:
+                print 'copyfile: copy', src, '->', dest, 'failed.', e
+                return False
+    else:
+            #we don't yet handle special, so we need to fall back to /bin/mv
+            a=getstatusoutput("/bin/cp -f "+"'"+src+"' '"+dest+"'")
+            if a[0]!=0:
+                print "copyfile: Failed to copy special file:" + src + "' to '" + dest + "'", a
+                return False # failure
+    try:
+        os.lchown(dest,sstat[stat.ST_UID],sstat[stat.ST_GID])
+        os.chmod(dest, stat.S_IMODE(sstat[stat.ST_MODE])) # Sticky is reset on chown
+    except Exception, e:
+        print "copyfile: Failed to chown/chmod/unlink", dest, e
+        return False
+
+    if newmtime:
+        os.utime(dest,(newmtime,newmtime))
+    else:
+        os.utime(dest, (sstat[stat.ST_ATIME], sstat[stat.ST_MTIME]))
+        newmtime=sstat[stat.ST_MTIME]
+    return newmtime
+
+def which(path, item, direction = 0):
+    """
+    Locate a file in a PATH
+    """
+
+    paths = (path or "").split(':')
+    if direction != 0:
+        paths.reverse()
+
+    for p in paths:
+        next = os.path.join(p, item)
+        if os.path.exists(next):
+            return next
+
+    return ""
--- a/build/conf/bblayers.conf.sample
+++ b/build/conf/bblayers.conf.sample
@@ -0,0 +1,9 @@
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "1"
+
+BBFILES ?= ""
+BBLAYERS = " \
+  ${OEROOT}/meta \
+  ${OEROOT}/meta-moblin \
+  "
--- a/build/conf/local.conf.sample
+++ b/build/conf/local.conf.sample
@@ -1,29 +1,24 @@
+# CONF_VERSION is increased each time build/conf/ changes incompatibly
+CONF_VERSION = "1"
+
 # Where to cache the files Poky downloads
 DL_DIR ?= "${OEROOT}/sources"
-BBFILES = "${OEROOT}/meta/packages/*/*.bb"
+# Where to cache Poky's built staging output
+PSTAGE_DIR ?= "${OEROOT}/pstage"

-# Poky has various extra metadata collections (openmoko, extras).
-# To enable these, uncomment all (or some of) the following lines:
-# BBFILES = "\
-#    ${OEROOT}/meta/packages/*/*.bb 
-#    ${OEROOT}/meta-extras/packages/*/*.bb
-#    ${OEROOT}/meta-openmoko/packages/*/*.bb
-#    "
-# BBFILE_COLLECTIONS = "normal extras openmoko"
-# BBFILE_PATTERN_normal = "^${OEROOT}/meta/"
-# BBFILE_PATTERN_extras = "^${OEROOT}/meta-extras/"
-# BBFILE_PATTERN_openmoko = "^${OEROOT}/meta-openmoko/"
-# BBFILE_PRIORITY_normal = "5"
-# BBFILE_PRIORITY_extras = "5"
-# BBFILE_PRIORITY_openmoko = "5"
-
-BBMASK = ""
+# Uncomment and set to allow bitbake to execute multiple tasks at once.
+# For a quadcore, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would
+# be appropriate.
+# BB_NUMBER_THREADS = "4"
+# Also, make can be passed flags so it run parallel threads e.g.:
+# PARALLEL_MAKE = "-j 4"

 # The machine to target
-MACHINE ?= "qemuarm"
+MACHINE ?= "qemux86"

 # Other supported machines
-#MACHINE ?= "qemux86"
+#MACHINE ?= "qemuarm"
+#MACHINE ?= "netbook"
 #MACHINE ?= "c7x0"
 #MACHINE ?= "akita"
 #MACHINE ?= "spitz"
@@ -43,6 +38,26 @@ DISTRO ?= "poky"
 # For bleeding edge / experimental / unstable package versions
 # DISTRO ?= "poky-bleeding"

+# Poky has various extra metadata collections (openmoko, extras).
+# To enable these, uncomment all (or some of) the following lines:
+# BBFILES = "\
+#    ${OEROOT}/meta/packages/*/*.bb \
+#    ${OEROOT}/meta-extras/packages/*/*.bb \
+#    ${OEROOT}/meta-openmoko/packages/*/*.bb \
+#    ${OEROOT}/meta-moblin/packages/*/*.bb \
+#    "
+# BBFILE_COLLECTIONS = "normal extras openmoko moblin"
+# BBFILE_PATTERN_normal = "^${OEROOT}/meta/"
+# BBFILE_PATTERN_extras = "^${OEROOT}/meta-extras/"
+# BBFILE_PATTERN_openmoko = "^${OEROOT}/meta-openmoko/"
+# BBFILE_PATTERN_moblin = "^${OEROOT}/meta-moblin/"
+# BBFILE_PRIORITY_normal = "5"
+# BBFILE_PRIORITY_extras = "5"
+# BBFILE_PRIORITY_openmoko = "5"
+# BBFILE_PRIORITY_moblin = "5"
+
+BBMASK = ""
+
 # EXTRA_IMAGE_FEATURES allows extra packages to be added to the generated images 
 # (Some of these are automatically added to certain image types)
 # "dbg-pkgs"     - add -dbg packages for all installed packages
@@ -92,18 +107,13 @@ PACKAGE_CLASSES ?= "package_ipk"
 # <build directory>/tmp
 TMPDIR = "${OEROOT}/build/tmp"

-# Uncomment and set to allow bitbake to execute multiple tasks at once.
-# Note, This option is currently experimental - YMMV.
-# BB_NUMBER_THREADS = "1"
-# Also, make can be passed flags so it run parallel threads e.g.:
-# PARALLEL_MAKE = "-j 4"

 # Uncomment this if you are using the Openedhand provided qemu deb - see README
 # ASSUME_PROVIDED += "qemu-native"

 # Comment this out if you don't have a 3.x gcc version available and wish
 # poky to build one for you. The 3.x gcc is required to build qemu-native.
-ASSUME_PROVIDED += "gcc3-native"
+# ASSUME_PROVIDED += "gcc3-native"

 # Uncomment these two if you want BitBake to build images useful for debugging.
 # DEBUG_BUILD = "1"
@@ -124,10 +134,6 @@ ASSUME_PROVIDED += "gcc3-native"
 # Uncomment this if you want BitBake to emit the log if a build fails.
 BBINCLUDELOGS = "yes"

-# Specifies a location to search for pre-generated tarballs when fetching
-# a cvs:// URI.  Uncomment this, if you not want to pull directly from CVS.
-CVS_TARBALL_STASH = "http://folks.o-hand.com/~richard/poky/sources/"
-
 # Set this if you wish to make pkgconfig libraries from your system available 
 # for native builds. Combined with extra ASSUME_PROVIDEDs this can allow 
 # native builds of applications like oprofileui-native (unsupported feature).
@@ -135,3 +141,13 @@ CVS_TARBALL_STASH = "http://folks.o-hand.com/~richard/poky/sources/"
 #ASSUME_PROVIDED += "gtk+-native libglade-native"

 ENABLE_BINARY_LOCALE_GENERATION = "1"
+
+# The architecture to build SDK items for, by setting this you can build SDK
+# packages for architectures other than the host i.e. building i586 packages
+# on an x86_64 host.
+# Supported values are i586 and x86_64
+#SDKMACHINE="i586"
+
+# Poky can try and fetch packaged-staging packages from a http, https or ftp
+# mirror. Set this variable to the root of a pstage directory on a server.
+#PSTAGE_MIRROR ?= "http://someserver.tld/share/pstage"
--- a/build/conf/site.conf.sample
+++ b/build/conf/site.conf.sample
@@ -0,0 +1,40 @@
+#
+# local.conf covers user settings, site.conf covers site specific information
+# such as proxy server addresses and optionally any shared download location
+#
+# SITE_CONF_VERSION is increased each time build/conf/site.conf
+# changes incompatibly
+SCONF_VERSION = "1"
+
+# Uncomment to cause CVS to use the proxy host specified
+#CVS_PROXY_HOST = "proxy.example.com"
+#CVS_PROXY_PORT = "81"
+
+# For svn, you need to create ~/.subversion/servers containing:
+#[global]
+#http-proxy-host = proxy.example.com
+#http-proxy-port = 81
+#
+
+# Uncomment to cause git to use the proxy host specificed 
+# although this only works for http
+#GIT_PROXY_HOST = "proxy.example.com"
+#GIT_PROXY_PORT = "81"
+#export GIT_PROXY_COMMAND = "${OEROOT}/scripts/poky-git-proxy-command"
+
+# GIT_PROXY_IGNORE_* lines define hosts which do not require a proxy to access
+#GIT_CORE_CONFIG = "Yes"
+#GIT_PROXY_IGNORE_1 = "host.server.com"
+#GIT_PROXY_IGNORE_2 = "another.server.com"
+
+# If SOCKS is available run the following command to comple a simple transport
+# gcc scripts/poky-git-proxy-socks.c -o poky-git-proxy-socks
+# and then share that binary somewhere in PATH, then use the following settings
+#GIT_PROXY_HOST = "proxy.example.com"
+#GIT_PROXY_PORT = "81"
+#export GIT_PROXY_COMMAND = "${OEROOT}/scripts/poky-git-proxy-socks-command"
+
+
+# Uncomment this to use a shared download directory
+#DL_DIR = "/some/shared/download/directory/"
+
--- a/handbook/Makefile
+++ b/handbook/Makefile
@@ -1,20 +1,27 @@
-all: html pdf
+all: html pdf tarball

 pdf:
-
-	poky-docbook-to-pdf poky-handbook.xml
+	./poky-doc-tools/poky-docbook-to-pdf poky-handbook.xml
+	./poky-doc-tools/poky-docbook-to-pdf bsp-guide.xml
 #       -- old way --
 #	dblatex poky-handbook.xml

+XSLTOPTS = --stringparam html.stylesheet style.css \
+           --stringparam  chapter.autolabel 1 \
+           --stringparam  appendix.autolabel 1 \
+           --stringparam  section.autolabel 1 \
+	   --xinclude
+
+##
+# These URI should be rewritten by your distribution's xml catalog to
+# match your localy installed XSL stylesheets.
+XSL_BASE_URI  = http://docbook.sourceforge.net/release/xsl/current
+XSL_XHTML_URI = $(XSL_BASE_URI)/xhtml/docbook.xsl
+
 html:
 #       See http://www.sagehill.net/docbookxsl/HtmlOutput.html 
-	xsltproc --stringparam html.stylesheet style.css \
-	         --stringparam  chapter.autolabel 1 \
-                 --stringparam  appendix.autolabel 1 \
-	         --stringparam  section.autolabel 1 \
-                 -o poky-handbook.html \
-                 --xinclude /usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl                                 \
-                  poky-handbook.xml
+	xsltproc $(XSLTOPTS) -o poky-handbook.html $(XSL_XHTML_URI) poky-handbook.xml
+	xsltproc $(XSLTOPTS) -o bsp-guide.html $(XSL_XHTML_URI) bsp-guide.xml
 #       -- old way --
 #	xmlto xhtml-nochunks poky-handbook.xml

@@ -23,3 +30,9 @@ tarball: html

 validate:
 	xmllint --postvalid --xinclude --noout poky-handbook.xml
+
+OUTPUTS = poky-handbook.tgz poky-handbook.html poky-handbook.pdf bsp-guide.pdf
+SOURCES = *.png *.xml *.css *.svg
+
+publish:
+	scp -r $(OUTPUTS) $(SOURCES) o-hand.com:/srv/www/pokylinux.org/doc/
--- a/handbook/TODO
+++ b/handbook/TODO
@@ -7,4 +7,5 @@ Handbook Todo List:
    intended target and could be a different arch etc and thus special case. 
  * Expand insane.bbclass documentation to cover tests
  * Document remaining classes (see list in ref-classes)
+  * Document formfactor

--- a/handbook/bsp-guide.xml
+++ b/handbook/bsp-guide.xml
@@ -0,0 +1,61 @@
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<book id='poky-handbook' lang='en' 
+      xmlns:xi="http://www.w3.org/2003/XInclude"
+      xmlns="http://docbook.org/ns/docbook"
+      >
+    <bookinfo>
+
+        <mediaobject>
+            <imageobject>
+                <imagedata fileref='common/poky-handbook.png' 
+                    format='SVG' 
+                    align='center' scalefit='1' width='100%'/>
+            </imageobject>    
+        </mediaobject>
+
+        <title>Board Support Package (BSP) Developers Guide</title>
+
+        <authorgroup>
+            <author>
+                <firstname>Richard</firstname> <surname>Purdie</surname>
+                <affiliation>
+                    <orgname>Intel Corporation</orgname>
+                </affiliation>
+                <email>richard@linux.intel.com</email>
+            </author>
+        </authorgroup>
+
+        <revhistory>
+            <revision>
+                <revnumber>0.4</revnumber>
+                <date>26 May 2010</date>
+                <revremark>Alpha Draft</revremark>
+            </revision>
+        </revhistory>
+
+    <copyright>
+      <year>2010</year>
+      <holder>Intel Corporation</holder>
+    </copyright>
+
+    <legalnotice>
+      <para>
+        Permission is granted to copy, distribute and/or modify this document under 
+        the terms of the <ulink type="http" url="http://creativecommons.org/licenses/by-nc-sa/2.0/uk/">Creative Commons Attribution-Non-Commercial-Share Alike 2.0 UK: England &amp; Wales</ulink> as published by Creative Commons.
+      </para>
+    </legalnotice>
+
+    </bookinfo>
+
+    <xi:include href="bsp.xml"/>
+
+    <index id='index'>
+      <title>Index</title>
+    </index>
+
+</book>
+<!-- 
+vim: expandtab tw=80 ts=4 
+-->
--- a/handbook/bsp.xml
+++ b/handbook/bsp.xml
@@ -0,0 +1,287 @@
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<chapter id='bsp'>
+
+        <title>Board Support Packages (BSP) - Developers Guide</title>
+
+        <para>
+            A Board Support Package (BSP) is a collection of information which together
+            defines how to support a particular hardware device, set of devices or 
+            hardware platform. It will include information about the hardware features 
+            present on the device, kernel configuration information along with any 
+            additional hardware drivers required and also any additional software 
+            components required in addition to a generic Linux software stack for both 
+            essential and optional platform features.
+        </para>
+
+        <para>
+            The intend of this document is to define a structure for these components
+            so that BSPs follow a commonly understood layout allowing them to be 
+            provided in a common way that everyone understands. It also allows end 
+            users to become familiar with one common format and encourages standardisation 
+            of software support of hardware.
+        </para>
+
+        <para>
+            The proposed format does have elements that are specific to the Poky and 
+            OpenEmbedded build systems. It is intended that this information can be 
+            used by other systems besides Poky/OpenEmbedded and that it will be simple
+            to extract information and convert to other formats if required. The format 
+            descriped can be directly accepted as a layer by Poky using its standard 
+            layers mechanism but its important to recognise that the BSP captures all 
+            the hardware specific details in one place in a standard format which is 
+            useful for any person wishing to use the hardware platform regardless of 
+            the build system in use.
+        </para>
+
+        <para>
+            The BSP specification does not include a build system or other tooling, 
+            it is concerned with the hardware specific components only. At the end 
+            distribution point the BSP may be shipped combined with a build system
+            and other tools but it is important to maintain the distinction that these
+            are separate components which may just be combined in certain end products.
+        </para>
+
+        <section id='bsp-filelayout'>
+            <title>Example Filesystem Layout</title>
+
+            <para>
+                The BSP consists of a file structure inside a base directory, meta-bsp in this example where "bsp" is a placeholder for the machine or platform name. Examples of some files that it could contain are:
+            </para>
+
+            <para>
+                <programlisting>
+meta-bsp/                                
+meta-bsp/binary/zImage
+meta-bsp/binary/poky-image-minimal.directdisk
+meta-bsp/conf/layer.conf 
+meta-bsp/conf/machine/*.conf             
+meta-bsp/conf/machine/include/tune-*.inc
+meta-bsp/packages/bootloader/bootloader_0.1.bb
+meta-bsp/packages/linux/linux-bsp-2.6.50/*.patch
+meta-bsp/packages/linux/linux-bsp-2.6.50/defconfig-bsp
+meta-bsp/packages/linux/linux-bsp_2.6.50.bb
+meta-bsp/packages/modem/modem-driver_0.1.bb
+meta-bsp/packages/modem/modem-daemon_0.1.bb
+meta-bsp/packages/image-creator/image-creator-native_0.1.bb
+meta-bsp/prebuilds/
+
+                </programlisting>
+            </para>
+
+            <para>
+                The following sections detail what these files and directories could contain.
+            </para>
+
+        </section>
+
+        <section id='bsp-filelayout-binary'>
+            <title>Prebuilt User Binaries (meta-bsp/binary/*)</title>
+
+            <para>
+                This optional area cotains useful prebuilt kernels and userspace filesystem 
+                images appropriate to the target system. Users could use these to get a system 
+                running and quickly get started on development tasks. The exact types of binaries
+                present will be highly hardware dependent but a README file should be present 
+                explaining how to use them with the target hardware. If prebuilt binaries are 
+                present, source code to meet licensing requirements must also be provided in 
+                some form.
+            </para>
+       
+        </section>
+
+        <section id='bsp-filelayout-layer'>
+            <title>Layer Configuration (meta-bsp/conf/layer.conf)</title>
+
+            <para>
+                This file identifies the structure as a Poky layer. This file identifies the 
+                contents of the layer and how contains information about how Poky should use 
+                it. In general it will most likely be a standard boilerplate file consisting of:
+            </para>
+
+            <para>
+               <programlisting>
+# We have a conf directory, add to BBPATH
+BBPATH := "${BBPATH}${LAYERDIR}"
+
+# We have a packages directory, add to BBFILES
+BBFILES := "${BBFILES} ${LAYERDIR}/packages/*/*.bb"
+
+BBFILE_COLLECTIONS += "meta-bsp"
+BBFILE_PATTERN_meta-bsp := "^${LAYERDIR}/"
+BBFILE_PRIORITY_meta-bsp = "5"
+                </programlisting>
+            </para>
+
+            <para>
+                which simply makes bitbake aware of the packages and conf directories.
+            </para>
+
+            <para>
+                This file is required for recognition of the BSP by Poky.
+            </para>
+
+        </section>
+
+        <section id='bsp-filelayout-machine'>
+            <title>Hardware Configuration Options (meta-bsp/conf/machine/*.conf)</title>
+
+            <para>
+                The machine files bind together all the information contained elsewhere
+                in the BSP into a format that Poky/OpenEmbedded can understand it in. If
+                the BSP supports multiple machines, multiple machine configuration files
+                can be present. These filenames correspond to the values users set the
+                MACHINE variable to.
+            </para>
+
+            <para>
+                These files would define things like which kernel package to use
+                (PREFERRED_PROVIDER of virtual/kernel), which hardware drivers to
+                include in different types of images, any special software components
+                that are needed, any bootloader information and also any special image
+                format requirements.
+            </para>
+
+            <para>
+                At least one machine file is required for a Poky BSP layer but more than one may be present.
+            </para>
+
+        </section>
+
+        <section id='bsp-filelayout-tune'>
+            <title>Hardware Optimisation Options (meta-bsp/conf/machine/include/tune-*.inc)</title>
+
+            <para>
+                These are shared hardware "tuning" definitions and are commonly used to
+                pass specific optimisation flags to the compiler. An example is
+                tune-atom.inc:
+            </para>
+            <para>
+               <programlisting>
+BASE_PACKAGE_ARCH = "core2"
+TARGET_CC_ARCH = "-m32 -march=core2 -msse3 -mtune=generic -mfpmath=sse"
+               </programlisting>
+            </para>
+            <para>
+                which defines a new package architecture called "core2" and uses the
+                optimisation flags specified which are carefully chosen to give best
+                performance on atom cpus.
+            </para>
+            <para>
+                The tune file would be included by the machine definition and can be
+                contained in the BSP or reference one from the standard core set of
+                files included with Poky itself.
+            </para>
+            <para>
+                These files are optional for a Poky BSP layer.
+            </para>
+        </section>
+        <section id='bsp-filelayout-kernel'>
+            <title>Linux Kernel Configuration (meta-bsp/packages/linux/*)</title>
+
+            <para>
+                These files make up the definition of a kernel to use with this
+                hardware. In this case its a complete self contained kernel with its own
+                configuration and patches but kernels can be shared between many
+                machines as well. Taking some specific example files:
+            </para>
+            <para>
+               <programlisting>
+meta-bsp/packages/linux/linux-bsp_2.6.50.bb
+               </programlisting>
+            </para>
+            <para>
+                which is the core kernel recipe which firstly details where to get the kernel
+                source from. All standard source code locations are supported so this could 
+                be a release tarball, some git repository or source included in
+                the directory within the BSP itself. It then contains information about which 
+                patches to apply and how to configure and build it. It can reuse the main
+                Poky kernel build class meaning the definitions here can remain very simple.
+            </para>
+            <para>
+               <programlisting>
+linux-bsp-2.6.50/*.patch
+               </programlisting>
+            </para>
+            <para>
+                which are patches which may be applied against the base kernel, wherever
+                that may have been obtained from.
+            </para>
+            <para>
+               <programlisting>
+meta-bsp/packages/linux/linux-bsp-2.6.50/defconfig-bsp
+               </programlisting>
+            </para>
+            <para>
+                which is the configuration information to use to configure the kernel.
+            </para>
+            <para>
+                Examples of kernel recipes are available in Poky itself. These files are
+                optional since a kernel from Poky itself could be selected although it
+                would be unusual not to have a kernel configuration.
+            </para>
+        </section>
+
+        <section id='bsp-filelayout-packages'>
+            <title>Other Software (meta-bsp/packages/*)</title>
+
+            <para>
+                This area includes other pieces of software which the hardware may need for best
+                operation. These are just examples of the kind of things that may be
+                encountered. The are standard .bb file recipes in the usual Poky format
+                so for examples, see standard Poky recipes. The source can be included directly, 
+                referred to in source control systems or release tarballs of external software projects.
+            </para>
+            <para>
+               <programlisting>
+meta-bsp/packages/bootloader/bootloader_0.1.bb
+               </programlisting>
+            </para>
+            <para>
+                Some kind of bootloader recipe which may be used to generate a new
+                bootloader binary. Sometimes these are included in the final image
+                format and needed to reflash hardware.
+            </para>
+            <para>
+               <programlisting>
+meta-bsp/packages/modem/modem-driver_0.1.bb
+meta-bsp/packages/modem/modem-daemon_0.1.bb
+               </programlisting>
+            </para>
+            <para>
+                These are examples of a hardware driver and also a hardware daemon which
+                may need to be included in images to make the hardware useful. "modem"
+                is one example but there may be other components needed like firmware.
+            </para>
+            <para>
+               <programlisting>
+meta-bsp/packages/image-creator/image-creator-native_0.1.bb
+               </programlisting>
+            </para>
+            <para>
+                Sometimes the device will need an image in a very specific format for
+                its update mechanism to accept and reflash with it. Recipes to build the
+                tools needed to do this can be included with the BSP.
+            </para>
+            <para>
+                These files only need be provided if the platform requires them.
+            </para>
+        </section>
+
+        <section id='bsp-filelayout-prebuilds'>
+            <title>Prebuild Data (meta-bsp/prebuilds/*)</title>
+
+            <para>
+                The location can contains a precompiled representation of the source code 
+                contained elsewhere in the BSP layer. It can be processed and used by
+                Poky to provide much faster build times assuming a compatible configuration is used.
+            </para>
+
+            <para>
+                These files are optional.
+            </para>
+
+        </section>
+
+</chapter>
--- a/handbook/contactus.xml
+++ b/handbook/contactus.xml
@@ -1,30 +0,0 @@
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<appendix id='contact'>
-    <title>OpenedHand Contact Information</title>
-
-    <literallayout>
-OpenedHand Ltd
-Unit R, Homesdale Business Center
-216-218 Homesdale Rd
-Bromley, BR1 2QZ
-England
-+44 (0) 208 819 6559
-info@openedhand.com</literallayout>
-
-    <!-- Fop messes this up so we do like above
-    <address>
-        OpenedHand Ltd
-        Unit R, Homesdale Business Center
-        <street>216-218 Homesdale Rd</street>
-        <city>Bromley</city>, <postcode>BR1 2QZ</postcode>
-        <country>England</country>
-        <phone> +44 (0) 208 819 6559</phone>
-        <email>info@openedhand.com</email>
-    </address>
-    -->
-</appendix>
-<!-- 
-vim: expandtab tw=80 ts=4 
-->
--- a/handbook/development.xml
+++ b/handbook/development.xml
@@ -59,13 +59,16 @@
         </screenshot>
 -->
        <para>
-            To use the plugin, a toolchain and SDK built by Poky is required along with Anjuta and the Anjuta 
-            plugin. The Poky Anjuta plugin is available from the OpenedHand SVN repository located at
-            http://svn.o-hand.com/repos/anjuta-poky/trunk/anjuta-plugin-sdk/; a web interface
-            to the repository can be accessed at <ulink url='http://svn.o-hand.com/view/anjuta-poky/'/>.
-            See the README file contained in the project for more information
-            about the dependencies and how to get them along with details of
-            the prebuilt packages.
+            To use the plugin, a toolchain and SDK built by Poky is required along with Anjuta it's development
+            headers and the Anjuta plugin. The Poky Anjuta plugin is available to download as a tarball at the
+            <ulink url='http://labs.o-hand.com/sources/anjuta-plugin-sdk/'>OpenedHand labs</ulink> page or
+            directly from the Poky Git repository located at git://git.pokylinux.org/anjuta-poky; a web interface
+            to the repository can be accessed at <ulink url='http://git.pokylinux.org/cgit.cgi/anjuta-poky/'/>.
+        </para>
+        <para>
+            See the README file contained in the project for more information on dependencies and building
+            the plugin. It's recommended you enable the experimental gdb integration by passing configure the
+            --enable-gdb-integration switch.
        </para>

        <section id="platdev-appdev-external-anjuta-setup">
@@ -496,7 +499,7 @@ $ bitbake matchbox-desktop -c devshell
                the gdb-cross package so for example you would run:
                <programlisting>bitbake gdb-cross</programlisting>
                Once built, the cross gdb binary can be found at
-                <programlisting>tmp/cross/bin/&lt;target-abi&gt;-gdb </programlisting>
+                <programlisting>tmp/sysroots/&lt;host-arch&lt;/usr/bin/&lt;target-abi&gt;-gdb </programlisting>
            </para>

        </section>
@@ -532,18 +535,18 @@ $ bitbake matchbox-desktop -c devshell
                Firstly you want to install the <emphasis>foo</emphasis> package to tmp/rootfs 
                by doing:
                </para>
-                <programlisting>tmp/staging/i686-linux/usr/bin/ipkg-cl -f \
-tmp/work/&lt;target-abi&gt;/poky-image-sato-1.0-r0/temp/ipkg.conf -o \
+                <programlisting>tmp/sysroots/i686-linux/usr/bin/opkg-cl -f \
+tmp/work/&lt;target-abi&gt;/poky-image-sato-1.0-r0/temp/opkg.conf -o \
 tmp/rootfs/ update</programlisting>
               <para>
                then,
                </para>
-                <programlisting>tmp/staging/i686-linux/usr/bin/ipkg-cl -f \
-tmp/work/&lt;target-abi&gt;/poky-image-sato-1.0-r0/temp/ipkg.conf \
+                <programlisting>tmp/sysroots/i686-linux/usr/bin/opkg-cl -f \
+tmp/work/&lt;target-abi&gt;/poky-image-sato-1.0-r0/temp/opkg.conf \
 -o tmp/rootfs install foo

-tmp/staging/i686-linux/usr/bin/ipkg-cl -f \
-tmp/work/&lt;target-abi&gt;/poky-image-sato-1.0-r0/temp/ipkg.conf \
+tmp/sysroots/i686-linux/usr/bin/opkg-cl -f \
+tmp/work/&lt;target-abi&gt;/poky-image-sato-1.0-r0/temp/opkg.conf \
 -o tmp/rootfs install foo-dbg</programlisting>
             <para>
                which installs the debugging information too.
@@ -802,7 +805,7 @@ $ opreport -cl
                located in /boot/vmlinux-KERNELVERSION, where KERNEL-version is the version of 
                the kernel e.g. 2.6.23. Poky generates separate vmlinux packages for each kernel
                it builds so it should be a question of just ensuring a matching package is 
-                installed (<command> ipkg install kernel-vmlinux</command>. These are automatically 
+                installed (<command> opkg install kernel-vmlinux</command>. These are automatically 
                installed into development and profiling images alongside OProfile. There is a 
                configuration option within the OProfileUI settings page where the location of 
                the vmlinux file can be entered. 
--- a/handbook/extendpoky.xml
+++ b/handbook/extendpoky.xml
@@ -26,7 +26,15 @@
        </para>

        <para>
-            The simplest way to add a new package is to base it on a similar
+            Before writing a recipe from scratch it is often useful to check
+            someone else hasn't written one already. OpenEmbedded is a good place 
+            to look as it has a wider scope and hence a wider range of packages.
+            Poky aims to be compatible with OpenEmbedded so most recipes should
+            just work in Poky.
+        </para>
+
+        <para>
+            For new packages, the simplest way to add a recipe is to base it on a similar
            pre-existing recipe. There are some examples below of how to add 
            standard types of packages:
        </para>
@@ -48,6 +56,7 @@
 DESCRIPTION = "Simple helloworld application"
 SECTION = "examples"
 LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ae764cfda68da96df20af9fbf9fe49bd"

 SRC_URI = "file://helloworld.c"

@@ -91,6 +100,7 @@ do_install() {
 DESCRIPTION = "GNU Helloworld application"
 SECTION = "examples"
 LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ae764cfda68da96df20af9fbf9fe49bd"

 SRC_URI = "${GNU_MIRROR}/hello/hello-${PV}.tar.bz2"

@@ -131,6 +141,7 @@ SECTION = "base"
 DEPENDS = "zlib"
 HOMEPAGE = "http://www.linux-mtd.infradead.org/"
 LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ae764cfda68da96df20af9fbf9fe49bd"

 SRC_URI = "ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-${PV}.tar.gz"

@@ -166,8 +177,8 @@ require xorg-lib-common.inc

 DESCRIPTION = "X11 Pixmap library"
 LICENSE = "X-BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ae764cfda68da96df20af9fbf9fe49bd"
 DEPENDS += "libxext"
-PE = "1"

 XORG_PN = "libXpm"

@@ -216,7 +227,7 @@ pkg_postinst_PACKAGENAME () {
            <para>
                Sometimes it is necessary that the execution of a post-installation
                script is delayed until the first boot, because the script 
-                needs to be executed the device itself.  To delay script execution
+                needs to be executed on the device itself.  To delay script execution
                until boot time, the post-installation function should have the
                following structure:
            </para>
@@ -269,7 +280,7 @@ inherit poky-image

            <para>
                By creating a custom image, a developer has total control
-                over the contents of the image. It is important use 
+                over the contents of the image. It is important to use 
                the correct names of packages in the <glossterm><link
                linkend='var-IMAGE_INSTALL'>IMAGE_INSTALL</link></glossterm> variable. 
                The names must be in 
@@ -296,11 +307,11 @@ IMAGE_INSTALL += "strace"
            <title>Customising Images through custom tasks</title>

            <para>
-                For for complex custom images, the best approach is to create a custom 
-                task package which is them used to build the image (or images). A good
+                For complex custom images, the best approach is to create a custom 
+                task package which is then used to build the image (or images). A good
                example of a tasks package is <filename>meta/packages/tasks/task-poky.bb
                </filename>. The <glossterm><link linkend='var-PACKAGES'>PACKAGES</link></glossterm> 
-                variable lists the task packages to build (along with the complimentary
+                variable lists the task packages to build (along with the complementary
                -dbg and -dev packages). For each package added,
                <glossterm><link linkend='var-PACKAGES'>RDEPENDS</link></glossterm> and
                <glossterm><link linkend='var-PACKAGES'>RRECOMMENDS</link></glossterm> 
@@ -469,7 +480,7 @@ bitbake poky-image-sato
            suitable defconfig file in a location similar to that used by other 
            machine's defconfig files in a given kernel, possibly listing it in
            the SRC_URI and adding the machine to the expression in <glossterm>
-            <link linkend='var-COMPATIBLE_MACHINES'>COMPATIBLE_MACHINES</link>
+            <link linkend='var-COMPATIBLE_MACHINE'>COMPATIBLE_MACHINE</link>
            </glossterm>.
        </para>
    </section>
@@ -507,57 +518,101 @@ bitbake poky-image-sato
        </para>
        <para>
            Poky supports the idea of <link
-                linkend='usingpoky-changes-collections'>"collections"</link> which when used
+                linkend='usingpoky-changes-layers'>"layers"</link> which when used
            properly can massively ease future upgrades and allow segregation
            between the Poky core and a given developer's changes. Some other advice on 
            managing changes to Poky is also given in the following section.
        </para>

-        <section id="usingpoky-changes-collections">
-            <title>Bitbake Collections</title>
+        <section id="usingpoky-changes-layers">
+          <title>Bitbake Layers</title>

-            <para>
+          <para>
                Often, people want to extend Poky either through adding packages
                or overriding files contained within Poky to add their own
                functionality. Bitbake has a powerful mechanism called
-                collections which provide a way to handle this which is fully
-                supported and actively encouraged within Poky.
+                layers which provides a way to handle this extension in a fully
+                supported and non-invasive fashion.
+           </para>
+
+          <para>
+               The Poky tree includes two additional layers which demonstrate
+               this functionality, meta-moblin and meta-extras.
+               The meta-extras repostory is not enabled by default but enabling
+               it is as easy as adding the layers path to the BBLAYERS variable in
+               your bblayers.conf, this is how all layers are enabled in Poky builds:
+          </para>
+          <para>
+               <literallayout class='monospaced'>LCONF_VERSION = "1"
+
+BBFILES ?= ""
+BBLAYERS = " \
+  ${OEROOT}/meta \
+  ${OEROOT}/meta-moblin \
+  ${OEROOT}/meta-extras \
+  "
+</literallayout>
+          </para>
+
+          <para>
+               Bitbake parses the conf/layer.conf of each of the layers in BBLAYERS
+               to add the layers packages, classes and configuration to Poky.
+               To create your own layer, independent of the main Poky repository,
+               you need only create a directory with a conf/layer.conf file and
+               add the directory to your bblayers.conf.
+          </para>
+
+          <para>
+               The meta-extras layer.conf demonstrates the required syntax:
+               <literallayout class='monospaced'># We have a conf and classes directory, add to BBPATH
+BBPATH := "${BBPATH}${LAYERDIR}"
+
+# We have a packages directory, add to BBFILES
+BBFILES := "${BBFILES} ${LAYERDIR}/packages/*/*.bb"
+
+BBFILE_COLLECTIONS += "extras"
+BBFILE_PATTERN_extras := "^${LAYERDIR}/"
+BBFILE_PRIORITY_extras = "5"
+
+require conf/distro/include/poky-extras-src-revisions.inc
+               </literallayout>
+          </para>
+
+          <para>
+                As can be seen, the layers recipes are added to BBFILES. The
+                BBFILE_COLLECTIONS variable is then appended to with the
+                layer name. The BBFILE_PATTERN variable is immediately expanded
+                with a regular expression used to match files from BBFILES into
+                a particular layer, in this case by using the base pathname.
+                The BBFILE_PRIORITY variable then assigns different
+                priorities to the files in different layers. This is useful
+                in situations where the same package might appear in multiple
+                layers and allows you to choose which layer should 'win'.
+                Note the use of LAYERDIR with the immediate expansion operator.
+                LAYERDIR expands to the directory of the current layer and
+                requires use of the immediate expansion operator so that Bitbake
+                does not lazily expand the variable when it's parsing a
+                different directory.
            </para>
+
            <para>
-                In the standard tree, meta-extras is an example of how you can
-                do this. As standard the data in meta-extras is not used on a
-                Poky build but local.conf.sample shows how to enable it:
+                Extra bbclasses and configuration are added to the BBPATH
+                environment variable. In this case, the first file with the
+                matching name found in BBPATH is the one that is used, just
+                like the PATH variable for binaries. It is therefore recommended
+                that you use unique bbclass and configuration file names in your
+                custom layer.
            </para>
+
            <para>
-                <literallayout class='monospaced'>
-BBFILES := "${OEROOT}/meta/packages/*/*.bb ${OEROOT}/meta-extras/packages/*/*.bb"
-BBFILE_COLLECTIONS = "normal extras"
-BBFILE_PATTERN_normal = "^${OEROOT}/meta/"
-BBFILE_PATTERN_extras = "^${OEROOT}/meta-extras/"
-BBFILE_PRIORITY_normal = "5"
-BBFILE_PRIORITY_extras = "5"</literallayout>
-            </para>
-            <para>
-                As can be seen, the extra recipes are added to BBFILES. The
-                BBFILE_COLLECTIONS variable is then set to contain a list of
-                collection names. The BBFILE_PATTERN variables are regular
-                expressions used to match files from BBFILES into a particular
-                collection in this case by using the base pathname. 
-                The BBFILE_PRIORITY variable then assigns the different
-                priorities to the files in different collections. This is useful
-                in situations where the same package might appear in both
-                repositories and allows you to choose which collection should
-                'win'.
-            </para>
-            <para>
-                This works well for recipes. For bbclasses and configuration
-                files, you can use the BBPATH environment variable. In this
-                case, the first file with the matching name found in BBPATH is
-                the one that is used, just like the PATH variable for binaries.
+                The recommended approach for custom layers is to store them in a
+                git repository of the format meta-prvt-XXXX and have this repository
+                cloned alongside the other meta directories in the Poky tree.
+                This way you can keep your Poky tree and it's configuration entirely
+                inside OEROOT.
            </para>
        </section>

-
        <section id='usingpoky-changes-commits'>
            <title>Committing Changes</title>

@@ -565,8 +620,8 @@ BBFILE_PRIORITY_extras = "5"</literallayout>
                Modifications to Poky are often managed under some kind of source
                revision control system. The policy for committing to such systems
                is important as some simple policy can significantly improve 
-                usability. The tips below are based on the policy that OpenedHand 
-                uses for commits to Poky.
+                usability. The tips below are based on the policy followed for the 
+                Poky core.
            </para>

            <para>
@@ -618,11 +673,74 @@ BBFILE_PRIORITY_extras = "5"</literallayout>
                the repository and don't have to remember to rebuild any sections.
                The second is to ensure that target users are able to upgrade their
                devices via their package manager such as with the <command>
-                ipkg update;ipkg upgrade</command> commands (or similar for 
+                opkg update;opkg upgrade</command> commands (or similar for 
                dpkg/apt or rpm based systems). The aim is to ensure Poky has 
                upgradable packages in all cases.
            </para>
        </section>
+        <section id='usingpoky-changes-collaborate'>
+            <title>Using Poky in a Team Environment</title>
+
+            <para>
+                It may not be immediately clear how Poky can work in a team environment, 
+                or scale to a large team of developers. The specifics of any situation
+                will determine the best solution and poky offers immense flexibility in 
+                that aspect but there are some practises that experience has shown to work
+                well.
+            </para>
+
+            <para>
+                The core component of any development effort with Poky is often an 
+                automated build testing framework and image generation process. This 
+                can be used to check that the metadata is buildable, highlight when 
+                commits break the builds and provide up to date images allowing people 
+                to test the end result and use them as a base platform for further 
+                development. Experience shows that buildbot is a good fit for this role 
+                and that it works well to configure it to make two types of build - 
+                incremental builds and 'from scratch'/full builds. The incremental builds 
+                can be tied to a commit hook which triggers them each time a commit is 
+                made to the metadata and are a useful acid test of whether a given commit 
+                breaks the build in some serious way. They catch lots of simple errors 
+                and whilst they won't catch 100% of failures, the tests are fast so 
+                developers can get feedback on their changes quickly. The full builds
+                are builds that build everything from the ground up and test everything. 
+                They usually happen at preset times such as at night when the machine 
+                load isn't high from the incremental builds.
+            </para>
+
+            <para>
+                Most teams have pieces of software undergoing active development. It is of
+                significant benefit to put these under control of a source control system 
+                compatible with Poky such as git or svn. The autobuilder can then be set to 
+                pull the latest revisions of these packages so the latest commits get tested 
+                by the builds allowing any issues to be highlighted quickly. Poky easily
+                supports configurations where there is both a stable known good revision 
+                and a floating revision to test. Poky can also only take changes from specific
+                source control branches giving another way it can be used to track/test only
+                specified changes.
+            </para>
+            <para>
+                Perhaps the hardest part of setting this up is the policy that surrounds 
+                the different source control systems, be them software projects or the Poky 
+                metadata itself. The circumstances will be different in each case but this is
+                one of Poky's advantages - the system itself doesn't force any particular policy
+                unlike a lot of build systems, allowing the best policy to be chosen for the 
+                circumstances.
+            </para>
+        </section>
+
+        <section id='usingpoky-changes-updatingimages'>
+            <title>Updating Existing Images</title>
+
+            <para>
+                Often, rather than reflashing a new image you might wish to install updated 
+                packages into an existing running system. This can be done by sharing the <filename class="directory">tmp/deploy/ipk/</filename> directory through a web server and then on the device, changing <filename>/etc/opkg/base-feeds.conf</filename> to point at this server, for example by adding:
+            </para>
+            <literallayout class='monospaced'>
+src/gz all http://www.mysite.com/somedir/deploy/ipk/all
+src/gz armv7a http://www.mysite.com/somedir/deploy/ipk/armv7a
+src/gz beagleboard http://www.mysite.com/somedir/deploy/ipk/beagleboard</literallayout>
+        </section>
    </section>

    <section id='usingpoky-modifing-packages'>
@@ -709,7 +827,7 @@ quilt refresh
                Poky metadata and added into <glossterm><link
                        linkend='var-SRC_URI'>SRC_URI</link></glossterm> of a recipe:
                <programlisting>
-SRC_URI += "file://NAME-OF-PATCH.patch;patch=1"
+SRC_URI += "file://NAME-OF-PATCH.patch"
                </programlisting>

                This also requires a bump of <glossterm><link
@@ -718,9 +836,112 @@ SRC_URI += "file://NAME-OF-PATCH.patch;patch=1"

        </section>

-</section>
+    </section>
+    <section id='usingpoky-configuring-LIC_FILES_CHKSUM'>
+        <title>Configuring the LIC_FILES_CHKSUM variable</title>
+        <para>
+        The changes in the license text inside source code files is tracked
+        using the LIC_FILES_CHKSUM metadata variable.
+        </para>

+        <section id='usingpoky-specifying-LIC_FILES_CHKSUM'>
+            <title>Specifying the LIC_FILES_CHKSUM variable </title>
+
+            <programlisting>
+LIC_FILES_CHKSUM = "file://COPYING; md5=xxxx \
+                    file://licfile1.txt; beginline=5; endline=29;md5=yyyy \
+                    file://licfile2.txt; endline=50;md5=zzzz \
+                    ..."
+            </programlisting>
+        </section>
+
+        <section id='usingpoky-LIC_FILES_CHKSUM-explanation-of-syntax'>
+            <title>Explanation of syntax</title>
+
+            <para>
+            This parameter lists all the important files containing the text 
+of licenses for the
+source code. It is also possible to specify on which line the license text
+starts and on which line it ends within that file using the "beginline" and
+"endline" parameters. If the "beginline" parameter is not specified then license
+text begins from the 1st line is assumed. Similarly if "endline" parameter is
+not specified then the license text ends at the last line in the file is
+assumed. So if a file contains only licensing information, then there is no need
+to specify "beginline" and "endline" parameters.
+            </para>
+            <para>
+The "md5" parameter stores the md5 checksum of the license text. So if
+the license text changes in any way from a file, then it's md5 sum will differ and will not
+match with the previously stored md5 checksum. This mismatch will trigger build
+failure, notifying developer about the license text md5 mismatch, and allowing
+the developer to review the license text changes. Also note that if md5 checksum
+is not matched while building, the correct md5 checksum is printed in the build
+log.
+            </para>
+            <para>
+There is no limit on how many files can be specified on this parameter. But generally every
+project would need specifying of just one or two files for license tracking.
+Many projects would have a "COPYING" file which will store all the
+license information for all the source code files. If the "COPYING" file
+is valid then tracking only that file would be enough.
+            </para>
+            <tip>
+                <para>
+1. If you specify empty or invalid "md5" parameter; then while building
+the package, bitbake will give md5 not matched error, and also show the correct
+"md5" parameter value in the build log
+                </para>
+                <para>
+2. If the whole file contains only license text, then there is no need to
+specify "beginline" and "endline" parameters. 
+                </para>
+            </tip>
+        </section>
+    </section>
+    <section id='usingpoky-configuring-DISTRO_PN_ALIAS'>
+        <title>Configuring the DISTRO_PN_ALIAS variable</title>
+        <para>
+Sometimes the names of the same packages are different in different
+linux distributions; and that can becomes an issue for the distro_check
+task to check if the given recipe package exists in other linux distros.
+This issue is avoided by defining per distro recipe name alias:
+DISTRO_PN_ALIAS
+        </para>
+
+        <section id='usingpoky-specifying-DISTRO_PN_ALIAS'>
+            <title>Specifying the DISTRO_PN_ALIAS variable </title>
+
+            <programlisting>
+DISTRO_PN_ALIAS = "distro1=package_name_alias1; distro2=package_name_alias2 \
+                    distro3=package_name_alias3; \
+                    ..."
+            </programlisting>
+            <para>
+Look at the meta/packages/xorg-app/xset_1.0.4.bb recipe file for an example.
+            </para>
+            <tip>
+                <para>
+The current code can check if the src package for a recipe exists in the latest
+releases of these distributions automatically.
+                </para>
+                <programlisting>
+Fedora, OpenSuSE, Debian, Ubuntu, Mandriva
+                </programlisting>
+                <para>
+For example, this command will generate a report, listing which linux distros include the
+sources for each of the poky recipe.
+                </para>
+                <programlisting>
+bitbake world -f -c distro_check
+                </programlisting>
+                <para>
+The results will be stored in the build/tmp/log/distro_check-${DATETIME}.results file.
+                </para>
+            </tip>
+        </section>
+    </section>
 </chapter>
+
 <!-- 
 vim: expandtab tw=80 ts=4 
 -->
--- a/handbook/faq.xml
+++ b/handbook/faq.xml
@@ -119,7 +119,7 @@
        </question>
        <answer>
            <para>
-                Poky can build packages in various formats, ipkg, Debian package, or RPM. The package can then be upgraded using the package tools on the device, much like on a desktop distribution like Ubuntu or Fedora.
+                Poky can build packages in various formats, ipk (for ipkg/opkg), Debian package (.deb), or RPM. The packages can then be upgraded using the package tools on the device, much like on a desktop distribution like Ubuntu or Fedora.
            </para>
        </answer>
    </qandaentry>
@@ -135,6 +135,18 @@
            </para>
        </answer>
    </qandaentry>
+    <qandaentry>
+        <question>
+            <para>
+                I see the error 'chmod: XXXXX new permissions are r-xrwxrwx, not r-xr-xr-x'. What's wrong?
+            </para>
+        </question>
+        <answer>
+            <para>
+                You're probably running the build on an NTFS filesystem. Use a sane one like ext2/3/4 instead!
+            </para>
+        </answer>
+    </qandaentry>
    <qandaentry>
        <question>
            <para>
@@ -226,6 +238,74 @@
            </para>
        </answer>
    </qandaentry>
+    <qandaentry>
+        <question>
+            <para>
+                I'm behind a firewall and need to use a proxy server. How do I do that?
+            </para>
+        </question>
+        <answer>
+            <para>
+                Most source fetching by Poky is done by wget and you therefore need to specify the proxy 
+                settings in a .wgetrc file in your home directory. Example settings in that file would be
+                'http_proxy = http://proxy.yoyodyne.com:18023/' and 'ftp_proxy = http://proxy.yoyodyne.com:18023/'.
+                Poky also includes a site.conf.sample file which shows how to configure cvs and git proxy servers
+                if needed.
+            </para>
+        </answer>
+    </qandaentry>
+    <qandaentry>
+        <question>
+            <para>
+                I'm using Ubuntu Intrepid and am seeing build failures. Whats wrong?
+            </para>
+        </question>
+        <answer>
+            <para>
+	        In Intrepid, Ubuntu turned on by default normally optional compile-time security features 
+		and warnings. There are more details at <ulink
+                url='https://wiki.ubuntu.com/CompilerFlags'>https://wiki.ubuntu.com/CompilerFlags</ulink>.
+		You can work around this problem by disabling those options by adding " -Wno-format-security -U_FORTIFY_SOURCE" 
+		to the BUILD_CPPFLAGS variable in conf/bitbake.conf.
+            </para>
+        </answer>
+    </qandaentry>
+    <qandaentry>
+        <question>
+            <para>
+                Whats the difference between foo and foo-native?
+            </para>
+        </question>
+        <answer>
+            <para>
+                The *-native targets are designed to run on the system the buil is running on. These are usually tools that are needed to assist the build in some way such as quilt-native which is used to apply patches. The non-native version is the one that would run on the target device.
+            </para>
+        </answer>
+    </qandaentry>
+    <qandaentry>
+        <question>
+            <para>
+                I'm seeing random build failures. Help?!
+            </para>
+        </question>
+        <answer>
+            <para>
+                If the same build is failing in totally different and random ways the most likely explaination is that either the hardware you're running it on has some problem or if you are running it under virtualisation, the virtualisation probably has bugs. Poky processes a massive amount of data causing lots of network, disk and cpu activity and is senstive to even single bit failure in any of these areas. Totally random failures have always been traced back to hardware or virtualisation issues.
+            </para>
+        </answer>
+    </qandaentry>
+    <qandaentry>
+        <question>
+            <para>
+                What do we need to ship for licence complience?
+            </para>
+        </question>
+        <answer>
+            <para>
+                This is a difficult question and you need to consult your lawyer for the answer for your specific case. Its worth bearing in mind that for GPL complience there needs to be enough information shipped to allow someone else to rebuild the same end result as you are shipping. This means sharing the source code, any patches applied to it but also any configuration information about how that package was configured and built.
+            </para>
+        </answer>
+    </qandaentry>
 </qandaset>
 </appendix>
 <!-- 
--- a/handbook/introduction.xml
+++ b/handbook/introduction.xml
@@ -58,7 +58,7 @@
    <screenshot>
    <mediaobject>
        <imageobject>
-            <imagedata fileref="screenshots/ss-sato.png" format="PNG"/>
+            <imagedata fileref="screenshots/ss-sato.png" format="PNG" align='center' scalefit='1' width="100%" contentdepth="100%"/>
        </imageobject>
        <caption>
            <para>The Sato Desktop - A screenshot from a machine running a Poky built image</para>
@@ -69,7 +69,7 @@

    <para>

-    Poky has a growing open source community backed up by commercial support provided by the principle developer and maintainer of Poky, <ulink url="http://o-hand.com/">OpenedHand Ltd</ulink>.
+    Poky has a growing open source community and is also backed up by commercial organisations including <ulink url="http://www.intel.com/">Intel Corporation</ulink>.

    </para>
 </section>
@@ -117,7 +117,7 @@
            <para>build-essential</para>
        </listitem>
        <listitem>
-            <para>python</para>
+            <para>python (version 2.6 or later)</para>
        </listitem>
        <listitem>
            <para>diffstat</para>
@@ -153,8 +153,8 @@
        <ulink url='http://debian.o-hand.com'/>
        for instructions on doing this) and then run <command>
        "apt-get install qemu poky-depends poky-scripts"</command> which will
-        automatically install all these dependencies. OpenedHand can also provide
-        VMware images with Poky and all dependencies pre-installed if required.
+        automatically install all these dependencies. Virtualisation images with 
+        Poky and all dependencies can also easily be built if required.
    </para>

    <para>
@@ -172,17 +172,17 @@
        <para>
            If you want to try Poky, you can do so in a few commands. The example below
            checks out the Poky source code, sets up a build environment, builds an
-            image and then runs that image under the QEMU emulator in ARM system emulation mode:
+            image and then runs that image under the QEMU emulator in x86 system emulation mode:
        </para>

        <para>
            <literallayout class='monospaced'>
-$ wget http://pokylinux.org/releases/pinky-3.1.tar.gz
-$ tar zxvf pinky-3.1.tar.gz
-$ cd pinky-3.1/
+$ wget http://pokylinux.org/releases/poky-green-3.3.tar.bz2
+$ tar xjvf poky-green-3.3.tar.bz2
+$ cd green-3.3/
 $ source poky-init-build-env
 $ bitbake poky-image-sato
-$ runqemu qemuarm
+$ runqemu qemux86
 </literallayout>
        </para>

@@ -196,9 +196,14 @@ $ runqemu qemuarm

        <para>
            To build for other machines see the <glossterm><link
-                    linkend='var-MACHINE'>MACHINE</link></glossterm> variable in build/conf/local.conf
-            which also contains other configuration information. The images/kernels built
-            by Poky are placed in the <filename class="directory">tmp/deploy/images</filename>
+                    linkend='var-MACHINE'>MACHINE</link></glossterm> variable in build/conf/local.conf.
+            This file contains other useful configuration information and the default version
+            has examples of common setup needs and is worth 
+            reading. To take advantage of multiple processor cores to speed up builds for example, set the 
+            <glossterm><link linkend='var-BB_NUMBER_THREADS'>BB_NUMBER_THREADS</link></glossterm>
+            and <glossterm><link linkend='var-PARALLEL_MAKE'>PARALLEL_MAKE</link></glossterm> variables.
+
+            The images/kernels built by Poky are placed in the <filename class="directory">tmp/deploy/images</filename>
            directory.
        </para>

@@ -284,7 +289,7 @@ $ poky-qemu &lt;kernel&gt; &lt;image&gt;
            We make nightly builds of Poky for testing purposes and to make the
            latest developments available. The output from these builds is available
            at <ulink url='http://pokylinux.org/autobuild/'/>
-            where the numbers represent the svn revision the builds were made from.
+            where the numbers increase for each subsequent build and can be used to reference it.
        </para>

        <para>
@@ -303,13 +308,13 @@ $ poky-qemu &lt;kernel&gt; &lt;image&gt;
        <title>Development Checkouts</title>

        <para>
-            Poky is available from our SVN repository located at
-            http://svn.o-hand.com/repos/poky/trunk; a web interface to the repository
-            can be accessed at <ulink url='http://svn.o-hand.com/view/poky/'/>.
+            Poky is available from our GIT repository located at
+            git://git.pokylinux.org/poky.git; a web interface to the repository
+            can be accessed at <ulink url='http://git.pokylinux.org/'/>.
        </para>

        <para>
-           'trunk' is where the deveopment work takes place and you should use this if you're
+           The 'master' is where the deveopment work takes place and you should use this if you're
           after to work with the latest cutting edge developments. It is possible trunk
           can suffer temporary periods of instability while new features are developed and
           if this is undesireable we recommend using one of the release branches.
--- a/handbook/poky-doc-tools/Makefile.am
+++ b/handbook/poky-doc-tools/Makefile.am
@@ -7,7 +7,13 @@ bin_SCRIPTS = poky-docbook-to-pdf
 edit = sed \
        -e 's,@datadir\@,$(pkgdatadir),g' \
        -e 's,@prefix\@,$(prefix),g'      \
-        -e 's,@version\@,@VERSION@,g'      
+        -e 's,@version\@,@VERSION@,g'
+
+##
+# These URI should be rewritten by your distribution's xml catalog to
+# match your localy installed XSL stylesheets.
+XSL_BASE_URI="http://docbook.sourceforge.net/release/xsl/current"
+XSL_TEMPLATE_URI = $(XSL_BASE_URI)/template/titlepage.xsl

 poky-docbook-to-pdf: poky-docbook-to-pdf.in
 	rm -f poky-docbook-to-pdf
--- a/handbook/poky-doc-tools/README
+++ b/handbook/poky-doc-tools/README
@@ -1,7 +1,7 @@
 poky-doc-tools
 ==============

-Simple tools to wrap fop to create oh branded PDF's from docbook sources.
+Simple tools to wrap fop to create Poky branded PDF's from docbook sources.
 (based on OH doc tools)

 Dependencies
@@ -9,15 +9,10 @@ Dependencies

 Sun Java, make sure the java in your path is the *sun* java.

-xlstproc, nwalsh style sheets.
+xlstproc, nwalsh style sheets, fop

 FOP, installed - see http://www.sagehill.net/docbookxsl/InstallingAnFO.html.
-Also a 'fop' binary, eg I have;
-
-% cat ~/bin/fop
-#!/bin/sh
-java org.apache.fop.apps.Fop "$@"
-
+Updated to work with (fop > 0.95)



--- a/handbook/poky-doc-tools/autogen.sh
+++ b/handbook/poky-doc-tools/autogen.sh
@@ -1,3 +1,3 @@
 #! /bin/sh
 autoreconf -v --install || exit 1
-./configure --enable-maintainer-mode --enable-debug "$@"
+./configure "$@"
--- a/handbook/poky-doc-tools/common/VeraMoBd.xml
+++ b/handbook/poky-doc-tools/common/VeraMoBd.xml
--- a/handbook/poky-doc-tools/common/VeraMono.xml
+++ b/handbook/poky-doc-tools/common/VeraMono.xml
--- a/handbook/poky-doc-tools/common/fop-config.xml.in
+++ b/handbook/poky-doc-tools/common/fop-config.xml.in
@@ -1,33 +1,58 @@
-<configuration>
-  <entry>
-  <!--
-   Set the baseDir so common/openedhand.svg references in plans still
-   work ok. Note, relative file references to current dir should still work.
-   -->	
-    <key>baseDir</key>
-    <value>@datadir@</value>
-  </entry>
-  <fonts>
-    <font  metrics-file="@datadir@/common/VeraMono.xml"
-           kerning="yes" 
-           embed-file="@datadir@/common/VeraMono.ttf">
-      <font-triplet name="veramono" style="normal" weight="normal"/>
-    </font>
+<fop version="1.0">

-    <font  metrics-file="@datadir@/common/VeraMoBd.xml"
-           kerning="yes" 
-           embed-file="@datadir@/common/VeraMoBd.ttf">
-      <font-triplet name="veramono" style="normal" weight="bold"/>
-    </font>
+  <!-- Strict user configuration -->
+  <strict-configuration>true</strict-configuration>

-    <font  metrics-file="@datadir@/common/Vera.xml"
-           kerning="yes" 
-           embed-file="@datadir@/common/Vera.ttf">
-     <font-triplet name="verasans" style="normal" weight="normal"/>
-     <font-triplet name="verasans" style="normal" weight="bold"/>
-     <font-triplet name="verasans" style="italic" weight="normal"/>
-     <font-triplet name="verasans" style="italic" weight="bold"/>
-    </font>
+  <!-- Strict FO validation -->
+  <strict-validation>true</strict-validation>
+
+   <!--
+    Set the baseDir so common/openedhand.svg references in plans still
+    work ok. Note, relative file references to current dir should still work.
+    -->	
+  <base>@datadir@</base>
+  <font-base>@datadir@/common</font-base>
+ 
+  <!-- Source resolution in dpi (dots/pixels per inch) for determining the
+       size of pixels in SVG and bitmap images, default: 72dpi -->
+  <!-- <source-resolution>72</source-resolution> -->
+  <!-- Target resolution in dpi (dots/pixels per inch) for specifying the
+       target resolution for generated bitmaps, default: 72dpi -->
+  <!-- <target-resolution>72</target-resolution> -->
+ 
+  <!-- default page-height and page-width, in case
+       value is specified as auto -->
+  <default-page-settings height="11in" width="8.26in"/> 
+ 
+  <!-- <use-cache>false</use-cache> -->
+ 
+  <renderers>
+    <renderer mime="application/pdf">
+      <fonts>
+        <font  metrics-file="VeraMono.xml"
+               kerning="yes" 
+               embed-url="VeraMono.ttf">
+          <font-triplet name="veramono" style="normal" weight="normal"/>
+        </font>
+
+        <font  metrics-file="VeraMoBd.xml"
+               kerning="yes" 
+               embed-url="VeraMoBd.ttf">
+          <font-triplet name="veramono" style="normal" weight="bold"/>
+        </font>
+
+        <font  metrics-file="Vera.xml"
+               kerning="yes" 
+               embed-url="Vera.ttf">
+          <font-triplet name="verasans" style="normal" weight="normal"/>
+          <font-triplet name="verasans" style="normal" weight="bold"/>
+          <font-triplet name="verasans" style="italic" weight="normal"/>
+          <font-triplet name="verasans" style="italic" weight="bold"/>
+        </font>
+        
+        <auto-detect/>
+      </fonts>
+    </renderer>
+  </renderers>
+</fop>

-  </fonts>
-</configuration>
--- a/handbook/poky-doc-tools/common/poky-db-pdf.xsl
+++ b/handbook/poky-doc-tools/common/poky-db-pdf.xsl
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" xmlns:fo="http://www.w3.org/1999/XSL/Format" version="1.0">
  
-  <xsl:import href="file:///usr/share/xml/docbook/stylesheet/nwalsh/fo/docbook.xsl"/>
+  <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl" />

  <!-- check project-plan.sh for how this is generated, needed to tweak 
       the cover page     
@@ -54,7 +54,7 @@
 
  <!-- general settings -->

-  <xsl:param name="fop.extensions" select="1"></xsl:param>
+  <xsl:param name="fop1.extensions" select="1"></xsl:param>
  <xsl:param name="paper.type" select="'A4'"></xsl:param>
  <xsl:param name="section.autolabel" select="1"></xsl:param>
  <xsl:param name="body.font.family" select="'verasans'"></xsl:param>
--- a/handbook/poky-doc-tools/poky-docbook-to-pdf.in
+++ b/handbook/poky-doc-tools/poky-docbook-to-pdf.in
@@ -18,9 +18,14 @@ BASENAME=`basename $1 .xml` || exit 1
 FO="$BASENAME.fo" 
 PDF="$BASENAME.pdf"

+##
+# These URI should be rewritten by your distribution's xml catalog to
+# match your localy installed XSL stylesheets.
+XSL_BASE_URI="http://docbook.sourceforge.net/release/xsl/current"
+
 xsltproc -o /tmp/titlepage.xsl                                           \
 	 --xinclude                                                      \
-         /usr/share/xml/docbook/stylesheet/nwalsh/template/titlepage.xsl \
+         $XSL_BASE_URI/template/titlepage.xsl \
         @datadir@/common/titlepage.templates.xml || exit 1

 xsltproc --xinclude                    \
--- a/handbook/poky-handbook.xml
+++ b/handbook/poky-handbook.xml
@@ -11,7 +11,7 @@
            <imageobject>
                <imagedata fileref='common/poky-handbook.png' 
                    format='SVG' 
-                    align='center'/>
+                    align='center' scalefit='1' width='100%'/>
            </imageobject>    
        </mediaobject>

@@ -22,46 +22,37 @@
            <author>
                <firstname>Richard</firstname> <surname>Purdie</surname>
                <affiliation>
-                    <orgname>OpenedHand Ltd</orgname>
+                    <orgname>Intel Corporation</orgname>
                </affiliation>
-                <email>richard@openedhand.com</email>
+                <email>richard@linux.intel.com</email>
            </author>

            <author>
                <firstname>Tomas</firstname> <surname>Frydrych</surname>
                <affiliation>
-                    <orgname>OpenedHand Ltd</orgname>
+                    <orgname>Intel Corporation</orgname>
                </affiliation>
-                <email>tf@openedhand.com</email>
            </author>

            <author>
                <firstname>Marcin</firstname> <surname>Juszkiewicz</surname>
-                <affiliation>
-                    <orgname>OpenedHand Ltd</orgname>
-                </affiliation>
-                <email>hrw@openedhand.com</email>
            </author>
            <author>
                <firstname>Dodji</firstname> <surname>Seketeli</surname>
-                <affiliation>
-                    <orgname>OpenedHand Ltd</orgname>
-                </affiliation>
-                <email>dodji@openedhand.com</email>
            </author>
        </authorgroup>

        <revhistory>
            <revision>
-                <revnumber>3.1</revnumber>
-                <date>15 Feburary 2008</date>
-                <revremark>Poky 3.1 (Pinky) Documentation Release</revremark>
+                <revnumber>3.3.1</revnumber>
+                <date>8 July 2010</date>
+                <revremark>Poky Green Documentation</revremark>
            </revision>
        </revhistory>

    <copyright>
-      <year>2007</year>
-      <holder>OpenedHand Limited</holder>
+      <year>2007-2010</year>
+      <holder>Intel Corporation</holder>
    </copyright>

    <legalnotice>
@@ -79,6 +70,8 @@

    <xi:include href="extendpoky.xml"/>

+    <xi:include href="bsp.xml"/>
+
    <xi:include href="development.xml"/>

    <xi:include href="ref-structure.xml"/>
@@ -99,8 +92,6 @@

    <xi:include href="resources.xml"/>

-    <xi:include href="contactus.xml"/>
-
    <index id='index'>
      <title>Index</title>
    </index>
--- a/handbook/ref-bitbake.xml
+++ b/handbook/ref-bitbake.xml
@@ -81,9 +81,10 @@
            default this specifies the <filename class="directory">meta/packages/
            </filename> directory within Poky, but other directories such as
            <filename class="directory">meta-extras/</filename> can be included 
-            too. If multiple directories are specified a system referred to as 
-            <link linkend='usingpoky-changes-collections'>"collections"</link> is used to 
-            determine which files have priority.
+            too. Adding extra content to
+            <glossterm><link linkend='var-BBFILES'>BBFILES</link></glossterm> is best
+            acheived through the use of Bitbake
+            <link linkend='usingpoky-changes-layers'>"layers"</link>.
        </para>

        <para>
--- a/handbook/ref-classes.xml
+++ b/handbook/ref-classes.xml
@@ -179,8 +179,8 @@ autotools_stage_all

    <para>
        During staging Bitbake installs such scripts into the <filename 
-        class="directory">staging/</filename> directory. It also changes all 
-        paths to point into the <filename class="directory">staging/</filename>
+        class="directory">sysroots/</filename> directory. It also changes all
+        paths to point into the <filename class="directory">sysroots/</filename>
        directory so all builds which use the script will use the correct 
        directories for the cross compiling layout.
    </para>
@@ -206,7 +206,7 @@ autotools_stage_all

    <para>
        During staging Bitbake installs pkg-config data into the <filename 
-        class="directory">staging/</filename> directory. By making use of 
+        class="directory">sysroots/</filename> directory. By making use of
        sysroot functionality within pkgconfig this class no longer has to 
        manipulate the files.
    </para>
@@ -266,19 +266,20 @@ autotools_stage_all
    <title>Python extensions - <filename>distutils.bbclass</filename></title>

    <para>
-        Recipes for Python extensions are simple - usually needs only
-        pointing to source archive and inheriting of proper bbclass.
-        Building is split into two methods dependly on method used by
-        module authors.
+        Recipes for Python extensions are simple - they usually only
+        require pointing to the source archive and inheriting the proper
+        bbclasses.
+        Building is split into two methods depending on the build method
+        used by the module authors.
    </para>
-    
+
    <para>
-        Extensions which use autotools based build system require using
+        Extensions which use autotools based build system require use
        of autotools and distutils-base bbclasses in their recipes.
    </para>

    <para>
-        Extensions which use distutils build system require using
+        Extensions which use distutils build system require use
        of <filename>distutils.bbclass</filename> in their recipes.
    </para>

@@ -300,12 +301,12 @@ autotools_stage_all
    <title>Packaging - <filename>package*.bbclass</filename></title>

    <para>
-        The packaging classes add support for generating packages from the output
-        from builds. The core generic functionality is in 
-        <filename>package.bbclass</filename>, code specific to particular package 
-        types is contained in various sub classes such as 
-        <filename>package_deb.bbclass</filename> and <filename>package_ipk.bbclass</filename>. 
-        Most users will 
+        The packaging classes add support for generating packages from a builds
+        output. The core generic functionality is in
+        <filename>package.bbclass</filename>, code specific to particular package
+        types is contained in various sub classes such as
+        <filename>package_deb.bbclass</filename> and <filename>package_ipk.bbclass</filename>.
+        Most users will
        want one or more of these classes and this is controlled by the <glossterm>
        <link linkend='var-PACKAGE_CLASSES'>PACKAGE_CLASSES</link></glossterm> 
        variable. The first class listed in this  variable will be used for image 
@@ -319,15 +320,15 @@ autotools_stage_all
    <title>Building kernels - <filename>kernel.bbclass</filename></title>

    <para>
-        This class handle building of Linux kernels and the class contains code to know how to build both 2.4 and 2.6 kernel trees. All needed headers are
+        This class handles building of Linux kernels and the class contains code to know how to build both 2.4 and 2.6 kernel trees. All needed headers are
        staged into <glossterm><link
                linkend='var-STAGING_KERNEL_DIR'>STAGING_KERNEL_DIR</link></glossterm>
        directory to allow building of out-of-tree modules using <filename>module.bbclass</filename>.
    </para>
    <para>
-        The means that each kerel module built is packaged separately and inter-modules dependencies are
+        The means that each kerel module built is packaged separately and inter-module dependencies are
        created by parsing the <command>modinfo</command> output. If all modules are
-        required then installing "kernel-modules" package will install all
+        required then installing the "kernel-modules" package will install all
        packages with modules and various other kernel packages such as "kernel-vmlinux" are also generated.
    </para>

@@ -377,7 +378,7 @@ autotools_stage_all
        packages generated by Poky. There are an ever increasing range of checks
        this makes, checking for common problems which break builds/packages/images,
        see the bbclass file for more information. Its usually up to distribution
-        policy to include this class (Poky doesn't at the time of writing but plans 
+        policy to include this class (Poky does).
        to soon).
    </para>
 </section>
--- a/handbook/ref-structure.xml
+++ b/handbook/ref-structure.xml
@@ -166,15 +166,6 @@
        </para>
    </section>

-    <section id='structure-build-tmp-cross'>
-        <title><filename class="directory">build/tmp/cross/</filename></title>
-
-        <para>
-            The cross compiler when generated is placed into this directory and those
-            beneath it.
-        </para>
-    </section>
-
    <section id='structure-build-tmp-deploy'>
        <title><filename class="directory">build/tmp/deploy/</filename></title>

@@ -216,11 +207,11 @@
        </para>
    </section>

-    <section id='structure-build-tmp-staging'>
-        <title><filename class="directory">build/tmp/staging/</filename></title>
+    <section id='structure-build-tmp-sysroots'>
+        <title><filename class="directory">build/tmp/sysroots/</filename></title>

        <para>
-            Any package needing to share output with other packages does so within staging.
+            Any package needing to share output with other packages does so within sysroots.
            This means it contains any shared header files and any shared libraries amongst
            other data. It is subdivided by architecture so multiple builds can run within
            the one build directory.
--- a/handbook/ref-variables.xml
+++ b/handbook/ref-variables.xml
@@ -66,7 +66,7 @@

        <glossentry id='var-BB_NUMBER_THREADS'><glossterm>BB_NUMBER_THREADS</glossterm>
            <glossdef>
-                <para>Number of BitBake threads</para>
+                <para>The maximum number of tasks BitBake should run in parallel at any one time</para>
            </glossdef>
        </glossentry>

@@ -84,6 +84,13 @@
            </glossdef>
        </glossentry>

+        <glossentry id='var-BPN'><glossterm>BPN</glossterm>
+            <glossdef>
+                <para>Bare name of package with any suffixes like -cross -native
+                removed.  </para>
+            </glossdef>
+        </glossentry>
+
    </glossdiv>

    <glossdiv id='var-glossary-c'><title>C</title>
@@ -97,7 +104,7 @@
            </glossdef>
        </glossentry>

-        <glossentry id='var-COMPATIBLE_MACHINES'><glossterm>COMPATIBLE_MACHINES</glossterm>
+        <glossentry id='var-COMPATIBLE_MACHINE'><glossterm>COMPATIBLE_MACHINE</glossterm>
            <glossdef>
                <para>A regular expression which evalutates to match the machines the recipe 
                works with. It stops recipes being run on machines they're incompatible with 
@@ -216,6 +223,19 @@
            </glossdef>
        </glossentry>

+        <glossentry id='var-DISTRO_PN_ALIAS'><glossterm>DISTRO_PN_ALIAS</glossterm>
+            <glossdef>
+                <para>Alias names of the recipe in various Linux distributions.  </para>
+                <para>See the "meta/package/xorg-app/xset_1.0.4.bb" file for an example</para>
+                <para>More information in 
+                    <link
+                        linkend='usingpoky-configuring-DISTRO_PN_ALIAS'>
+                        Configuring the DISTRO_PN_ALIAS variable section
+                    </link>
+                </para>
+            </glossdef>
+        </glossentry>
+
        <glossentry id='var-DISTRO_VERSION'><glossterm>DISTRO_VERSION</glossterm>
            <glossdef>
                <para>Version of distribution</para>
@@ -390,11 +410,37 @@

    <glossdiv id='var-glossary-l'><title>L</title>

+        <glossentry id='var-LAYERDIR'><glossterm>LAYERDIR</glossterm>
+            <glossdef>
+                <para>When used inside a layer.conf gives the path of the
+                current layer. This variable requires immediate expansion
+                (see the Bitbake manual) as lazy expansion can result in
+                the expansion happening in the wrong directory and therefore
+                giving the wrong value.</para>
+            </glossdef>
+        </glossentry>
        <glossentry id='var-LICENSE'><glossterm>LICENSE</glossterm>
            <glossdef>
                <para>List of package source licenses.</para>
            </glossdef>
        </glossentry>
+        <glossentry id='var-LIC_FILES_CHKSUM'><glossterm>LIC_FILES_CHKSUM</glossterm>
+            <glossdef>
+                <para>Checksums of the license text in the recipe source code.
+                </para>
+                <para>This variables tracks changes in license text of the source
+                code files. If the license text is changed it triggers the build
+                failure. Which gives developer an oppurtunity to review any 
+                license changes</para>
+                <para> This is an optional variable now. And the plan is to make
+                it a required variable in the future </para>
+                <para>See the "meta/package/zlib/zlib_${PV}.bb" file for an example</para>
+
+                <para>More information in <link
+                    linkend='usingpoky-configuring-LIC_FILES_CHKSUM'>
+                    Configuring the LIC_FILES_CHKSUM variable section</link></para>
+            </glossdef>
+        </glossentry>

    </glossdiv>

@@ -483,6 +529,14 @@
            </glossdef>
        </glossentry>

+        <glossentry id='var-PARALLEL_MAKE'><glossterm>PARALLEL_MAKE</glossterm>
+            <glossdef>
+                <para>Extra options that are passed to the make command during the 
+                    compile tasks. This is usually of the form '-j 4' where the number
+                    represents the maximum number of parallel threads make can run.</para>
+            </glossdef>
+        </glossentry>
+
        <glossentry id='var-PN'><glossterm>PN</glossterm>
            <glossdef>
                <para>Name of package.
@@ -507,7 +561,7 @@
        <glossentry id='var-PE'><glossterm>PE</glossterm>
            <glossdef>
                <para>
-                    Epoch of the package. The default value is "1". The field is used 
+                    Epoch of the package. The default value is "0". The field is used 
                    to make upgrades possible when the versioning scheme changes in 
                    some backwards incompatible way.
                </para>
@@ -532,6 +586,13 @@
            </glossdef>
        </glossentry>

+        <glossentry id='var-POKY_EXTRA_INSTALL'><glossterm>POKY_EXTRA_INSTALL</glossterm>
+            <glossdef>
+                <para>List of packages to be added to the image. This should
+                only be set in <filename>local.conf</filename>.</para>
+            </glossdef>
+        </glossentry>
+
        <glossentry id='var-POKYLIBC'><glossterm>POKYLIBC</glossterm>
            <glossdef>
                <para>Libc implementation selector - glibc or uclibc can be selected.</para>
@@ -571,7 +632,7 @@
                    output packages there would usually be an override attached 
                    to this variable like RDEPENDS_${PN}-dev. Names in this field 
                    should be as they are in <link linkend='var-PACKAGES'>PACKAGES
-                    </link> namespave before any renaming of the output package
+                    </link> namespace before any renaming of the output package
                    by classes like debian.bbclass.
                </para>
            </glossdef>
--- a/handbook/ref-varlocality.xml
+++ b/handbook/ref-varlocality.xml
@@ -127,6 +127,9 @@
            <listitem>
                <para><glossterm><link linkend='var-LICENSE'>LICENSE</link></glossterm></para>
            </listitem>
+            <listitem>
+                <para><glossterm><link linkend='var-LIC_FILES_CHKSUM'>LIC_FILES_CHKSUM</link></glossterm></para>
+            </listitem>
            <listitem>
                <para><glossterm><link linkend='var-SECTION'>SECTION</link></glossterm></para>
            </listitem>
@@ -184,6 +187,10 @@
        <title>Recipe Variables - Extra Build Information</title>

        <itemizedlist>
+            <listitem>
+                <para><glossterm><link
+                linkend='var-DISTRO_PN_ALIAS'>DISTRO_PN_ALIAS</link></glossterm></para>
+            </listitem>
            <listitem>
                <para><glossterm><link linkend='var-EXTRA_OECONF'>EXTRA_OECONF</link></glossterm></para>
            </listitem>
--- a/handbook/resources.xml
+++ b/handbook/resources.xml
@@ -58,8 +58,13 @@ poky+subscribe &lt;at&gt; openedhand &lt;dot&gt; com
        </para></listitem>
        <listitem><para>
            <ulink url='http://www.openedhand.com/'>OpenedHand</ulink> - The
-            company behind Poky.
+            original company behind Poky.
        </para></listitem>
+        <listitem><para>
+            <ulink url='http://www.intel.com/'>Intel Corporation</ulink> - The
+            company who acquired OpenedHand in 2008.
+        </para></listitem>
+
        <listitem><para>
            <ulink url='http://www.openembedded.org/'>OpenEmbedded</ulink>
            - The upstream generic embedded distribution Poky derives
@@ -86,6 +91,51 @@ poky+subscribe &lt;at&gt; openedhand &lt;dot&gt; com
    </itemizedlist>
 </section>

+<section id='resources-contributions'>
+    <title>Contributions</title>
+
+    <para>
+        Contributions to Poky are very welcome. Patches should be sent to the Poky mailing list along with a Signed-off-by: line in the same style as the Linux kernel. Adding this line signifies the developer has agreed to the         Developer's Certificate of Origin 1.1:
+    </para>
+
+            <programlisting>
+        Developer's Certificate of Origin 1.1
+
+        By making a contribution to this project, I certify that:
+
+        (a) The contribution was created in whole or in part by me and I
+            have the right to submit it under the open source license
+            indicated in the file; or
+
+        (b) The contribution is based upon previous work that, to the best
+            of my knowledge, is covered under an appropriate open source
+            license and I have the right under that license to submit that
+            work with modifications, whether created in whole or in part
+            by me, under the same open source license (unless I am
+            permitted to submit under a different license), as indicated
+            in the file; or
+
+        (c) The contribution was provided directly to me by some other
+            person who certified (a), (b) or (c) and I have not modified
+            it.
+
+        (d) I understand and agree that this project and the contribution
+            are public and that a record of the contribution (including all
+            personal information I submit with it, including my sign-off) is
+            maintained indefinitely and may be redistributed consistent with
+            this project or the open source license(s) involved.
+</programlisting>
+
+    <para>
+        A Poky contributions tree (poky-contrib) exists for people to stage 
+        contributions in, for regular contributors. If people desire such 
+        access, please ask on the mailing list. Usually access will be given
+        to anyone with a proven track record of good patches.
+    </para>
+
+</section>
+
+
 </appendix>
 <!-- 
 vim: expandtab tw=80 ts=4 
--- a/handbook/style.css
+++ b/handbook/style.css
@@ -64,8 +64,8 @@ h1 {
 }

 h2.subtitle {
-  margin: 0.10em 0 3.0em 0;
-  padding: 0 0 0 0;
+  margin: 0.10em 0em 3.0em 0em;
+  padding: 0em 0em 0em 0em;
  font-size: 1.8em;
  padding-left: 20%;
  font-weight: normal;
@@ -83,7 +83,7 @@ h3.subtitle {
  margin: 0em 0em 1em 0em;
  padding: 0em 0em 0em 0em;
  font-size: 142.14%;
-  text-align : right;
+  text-align: right;
 }

 h3 {
@@ -117,7 +117,7 @@ h6 {
 .authorgroup {
  background-color: transparent;
  background-repeat: no-repeat;
-  padding-top: 256;
+  padding-top: 256px;
  background-image: url("poky-beaver.png");
  background-position: right top;
  float: right; 
@@ -129,8 +129,8 @@ h6 {
 }

 h3.author {
-  margin: 0 0 0 0;
-  padding: 0 0 0 0;
+  margin: 0em 0me 0em 0em;
+  padding: 0em 0em 0em 0em;
  font-weight: normal;
  font-size: 100%;
  clear: both;
@@ -141,7 +141,7 @@ h3.author {
 }

 .titlepage hr {
-  width: 0;
+  width: 0em;
  clear: both;
 }

@@ -161,9 +161,9 @@ h3.author {
 .list-of-tables p,
 .list-of-figures p,
 .list-of-examples p {
-  padding: 0 0 0 0;
+  padding: 0em 0em 0em 0em;
  padding: 0em 0em 0.3em;
-  margin: 1.5em 0 0 0;
+  margin: 1.5em 0em 0em 0em;
 }

 .toc p b,
@@ -178,18 +178,18 @@ h3.author {
 .list-of-tables dl,
 .list-of-figures dl,
 .list-of-examples dl {
-  margin: 0 0 0.5em 0;
-  padding: 0 0 0 0;
+  margin: 0em 0em 0.5em 0em;
+  padding: 0em 0em 0em 0em;
 }

 .toc dt {
-  margin: 0 0 0 0;
-  padding: 0 0 0 0;
+  margin: 0em 0em 0em 0em;
+  padding: 0em 0em 0em 0em;
 }

 .toc dd {
  margin: 0em 0em 0em 2.6em;
-  padding: 0 0 0 0;
+  padding: 0em 0em 0em 0em;
 }

 div.glossary dl,
@@ -222,8 +222,8 @@ div.variablelist dl {


 div.calloutlist table td {
-  padding: 0 0 0 0;
-  margin: 0 0 0 0;
+  padding: 0em 0em 0em 0em;
+  margin: 0em 0em 0em 0em;
 }

 div.calloutlist table td p {
@@ -236,12 +236,12 @@ div p.copyright {
 }

 div.legalnotice p.legalnotice-title {
-  margin-bottom: 0;
+  margin-bottom: 0em;
 }

 p {
  line-height: 1.5em;
-  margin-top: 0;
+  margin-top: 0em;
  
 }

@@ -264,11 +264,11 @@ img {
 }

 ul {
-  padding: 0 0 0 1.5em;
+  padding: 0em 0em 0em 1.5em;
 }

 ul li {
-  padding: 0 0 0 0;
+  padding: 0em 0em 0em 0em;
 }

 ul li p {
@@ -292,8 +292,8 @@ td {
 }

 p a[id] {
-  margin: 0;
-  padding: 0;
+  margin: 0px;
+  padding: 0px;
  display: inline;
  background-image: none;
 } 
@@ -304,7 +304,7 @@ a {
 }

 pre {
-    overflow : auto;
+    overflow: auto;
 }

 a:hover {
@@ -331,8 +331,8 @@ div.informaltable p.title b,
 div.figure p.title b,
 div.example p.title b,
 div.table p.title b{
-    padding-top: 0;
-    margin-top: 0;
+    padding-top: 0em;
+    margin-top: 0em;
    font-size: 100%;
    font-weight: normal;
 }
@@ -398,7 +398,7 @@ span.application {
 .caution table th,
 .note table th {
  padding: 0.8em 0.0em 0.0em 0.0em;
-  margin : 0 0 0 0;
+  margin : 0em 0em 0em 0em;
 }

 .tip p,
@@ -418,7 +418,7 @@ span.application {
 b.keycap,
 .keycap {
  padding: 0.09em 0.3em;
-  margin: 0;
+  margin: 0em;
 }

 .itemizedlist li {
@@ -433,8 +433,8 @@ b.keycap,

 div.navheader, div.heading{
  position: absolute;
-  left: 0;
-  top: 0;
+  left: 0em;
+  top: 0em;
  width: 100%;
  background-color: #cdf;
  width: 100%;
@@ -461,16 +461,16 @@ div.navheader table th {
 }

 div.navheader table {
-  border-left: 0;
-  border-right: 0;
-  border-top: 0;
+  border-left: 0em;
+  border-right: 0em;
+  border-top: 0em;
  width: 100%;
 }

 div.navfooter table {
-  border-left: 0;
-  border-right: 0;
-  border-bottom: 0;
+  border-left: 0em;
+  border-right: 0em;
+  border-bottom: 0em;
  width: 100%;
 }

@@ -506,13 +506,13 @@ div.navfooter hr {


 .qandaset tr.question td p {
-  margin: 0 0 1em 0;
-  padding: 0 0 0 0;
+  margin: 0em 0em 1em 0em;
+  padding: 0em 0em 0em 0em;
 }

 .qandaset tr.answer td p {
-  margin: 0 0 1em 0;
-  padding: 0 0 0 0;
+  margin: 0em 0em 1em 0em;
+  padding: 0em 0em 0em 0em;
 }
 .answer td {
  padding-bottom: 1.5em;
@@ -572,7 +572,7 @@ div.informalfigure,
 div.informaltable,
 div.informalexample,
 div.example {
-  border         : 1px solid;
+  border: 1px solid;
 }


@@ -581,14 +581,14 @@ div.example {
 .warning,
 .caution,
 .note {
-  border    : 1px solid;
+  border: 1px solid;
 }

 .tip table th,
 .warning table th,
 .caution table th,
 .note table th {
-  border-bottom  : 1px solid;
+  border-bottom: 1px solid;
 }

 .question td {
@@ -640,7 +640,7 @@ h5,
 h6,
 h7,
 h8 {
-  background-color   : transparent;
+  background-color: transparent;
 }

 hr {
@@ -649,7 +649,7 @@ hr {


 .tip, .warning, .caution, .note {
-  border-color    : #aaa;
+  border-color: #aaa;
 }


@@ -784,7 +784,7 @@ h1.title {
  background-color: transparent;
  background-image: url("poky-handbook.png");
  background-repeat: no-repeat;
-  height: 256;
+  height: 256px;
  text-indent: -9000px;
  overflow:hidden;
 }
@@ -793,7 +793,7 @@ h2.subtitle {
  background-color: transparent;
  text-indent: -9000px;
  overflow:hidden;
-  width: 0;
+  width: 0px;
  display: none;
 }

@@ -864,7 +864,7 @@ body {
 / ****************************************/
 /*
 div.navfooter, div.footing{
-  -moz-opacity: 0.8;
+  -moz-opacity: 0.8em;
 }

 div.figure,
@@ -896,11 +896,11 @@ hr {
 }

 table {
-  border: 0;
+  border: 0em;
 }

 .photo {
-  float:right;
+  float: right;
  margin-left:   1.5em;
  margin-bottom: 1.5em;
  margin-top: 0em;
@@ -911,7 +911,7 @@ table {
 }
 .seperator {
   padding-top: 2em;
-   clear      :both;
+   clear: both;
  }

  #validators {
@@ -939,8 +939,8 @@ table {

 .tip h3,
 .note h3 {
-   padding: 0;
-   margin: 0;
+   padding: 0em;
+   margin: 0em;
   font-size: 2em;
   font-weight: bold;
   color: #fff;   
@@ -950,4 +950,4 @@ table {
 .note a {
   color: #fff;   
   text-decoration: underline;
-}
+}
--- a/handbook/usingpoky.xml
+++ b/handbook/usingpoky.xml
@@ -27,7 +27,7 @@
        and configuration data for machines, policy decisions, etc., which acts as
        a glue and binds everything together. Bitbake knows how to combine multiple
        data sources together, each data source being referred to as a <link
-            linkend='usingpoky-changes-collections'>'collection'</link>.
+            linkend='usingpoky-changes-layers'>'layer'</link>.
    </para>

    <para>
@@ -75,7 +75,7 @@
        </para>

        <para>
-            'package' can also used to describe recipes but since the same
+            'package' can also be used to describe recipes but since the same
            word is used for the packaged output from Poky (i.e. .ipk or .deb
            files), this document will avoid it.
        </para>
@@ -114,7 +114,7 @@
    <title>Running a Build</title>

    <para>
-        First the Poky build environment needs to be setup using the following command:
+        First the Poky build environment needs to be set up using the following command:
    </para>
    <para>
        <literallayout class='monospaced'>
@@ -122,7 +122,7 @@ $ source poky-init-build-env
 </literallayout>
    </para>
    <para>
-        Once the Poky build environment is setup, a target can now be built using:
+        Once the Poky build environment is set up, a target can now be built using:
    </para>
    <para>
        <literallayout class='monospaced'>
@@ -204,11 +204,11 @@ route add default gw 192.168.7.200 tap0
        <para>
            The second is to configure name resolution which is configured in the 
            <filename>/etc/resolv.conf</filename> file. The simplest solution is 
-            to copy it's content from the host machine.
+            to copy its content from the host machine.
        </para>

        <para>
-            USB connections to devices can be setup and automated in a similar way.
+            USB connections to devices can be set up and automated in a similar way.
            First add the following to
            <filename>/etc/network/interfaces</filename>:
        </para>
@@ -246,7 +246,7 @@ route add default gw 192.168.0.202 usb0
        debugging practises such as comparing to the last 
        known working version and examining the changes, reapplying the 
        changes in steps to identify the one causing the problem etc. are
-        valid for Poky just like any other system. Its impossible to detail
+        valid for Poky just like any other system. It's impossible to detail
        every possible potential failure here but there are some general
        tips to aid debugging:
    </para>
@@ -293,7 +293,7 @@ route add default gw 192.168.0.202 usb0
        <para>
            which would build matchbox-desktop, then recompile it. The
            final command reruns all tasks after the compile (basically
-            the packaging tasks) since bitbake will notice the the
+            the packaging tasks) since bitbake will notice that the
            compile has been rerun and hence the other tasks also need
            to run again.
        </para>
--- a/meta-extras/conf/distro/include/poky-extras-src-revisions.inc
+++ b/meta-extras/conf/distro/include/poky-extras-src-revisions.inc
@@ -0,0 +1,6 @@
+SRCREV_pn-evince ??= "2437"
+SRCDATE_maemo-mapper-nohildon ??= "20061114"
+SRCREV_pn-libxosd ??= "627"
+SRCREV_pn-matchbox-applet-light ??= "1548"
+SRCREV_pn-matchbox-common ??= "1561"
+
--- a/meta-extras/conf/layer.conf
+++ b/meta-extras/conf/layer.conf
@@ -0,0 +1,11 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH := "${BBPATH}${LAYERDIR}"
+
+# We have a packages directory, add to BBFILES
+BBFILES := "${BBFILES} ${LAYERDIR}/packages/*/*.bb"
+
+BBFILE_COLLECTIONS += "extras"
+BBFILE_PATTERN_extras := "^${LAYERDIR}/"
+BBFILE_PRIORITY_extras = "5"
+
+require conf/distro/include/poky-extras-src-revisions.inc
--- a/meta-extras/packages/eventlog/eventlog_0.2.5.bb
+++ b/meta-extras/packages/eventlog/eventlog_0.2.5.bb
@@ -5,7 +5,3 @@ PR = "r1"
 SRC_URI = "http://www.balabit.com/downloads/files/eventlog/0.2/${P}.tar.gz"

 inherit autotools pkgconfig
-
-do_stage () {
-	autotools_stage_all
-}
--- a/meta-extras/packages/flumotion/flumotion_0.4.1.bb
+++ b/meta-extras/packages/flumotion/flumotion_0.4.1.bb
@@ -1,13 +1,19 @@
 DESCRIPTION = "Fluendo Streaming Server"
 LICENSE = "GPL"
-DEPENDS = "gstreamer python-gst twisted python-pygtk2"
-RDEPENDS = "python-twisted-core python-twisted-web python-core python-gst"
-RDEPENDS_${PN}-gui = "${PN} python-pygtk2"
-PR = "r3"
+DEPENDS = "gstreamer python-imaging python-gst twisted python-pygtk"
+RDEPENDS = "python-resource python-pprint python-threading \
+            python-imaging python-xml python-curses \
+            python-compression python-fcntl python-pygobject \
+            python-pickle python-netclient python-datetime \
+            python-crypt python-twisted-core python-twisted-web \
+            python-lang python-zopeinterface  python-textutils \
+            python-gst python-misc"
+RDEPENDS_${PN}-gui = "${PN} python-pygtk python-pycairo"
+PR = "r10"

 SRC_URI = "http://www.flumotion.net/src/flumotion/flumotion-${PV}.tar.bz2 \
           file://python-path.patch;patch=1 \
-	   file://no-check-for-python-stuff.patch;patch=1"
+           file://no-check-for-python-stuff.patch;patch=1"

 inherit autotools distutils-base pkgconfig

@@ -17,13 +23,18 @@ EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"

 PACKAGES =+ "flumotion-gui"

+FILES_${PN}-dbg += "${libdir}/flumotion/python/flumotion/extern/*/.debug/*"
 FILES_${PN} = "${bindir} ${sbindir} ${libdir}/flumotion"
 FILES_${PN}-dev += "${libdir}/pkgconfig"
 FILES_${PN}-gui = "${bindir}/flumotion-admin ${bindir}/flumotion-tester \
                   ${libdir}/flumotion/python/flumotion/admin/gtk \
                   ${libdir}/flumotion/python/flumotion/component/*/admin_gtk* \
                   ${libdir}/flumotion/python/flumotion/component/*/*/admin_gtk* \
-                   ${libdir}/flumotion/python/flumotion/extern \
+                   ${libdir}/flumotion/python/flumotion/extern/*.py* \
+                   ${libdir}/flumotion/python/flumotion/extern/fdpass/*.py* \
+                   ${libdir}/flumotion/python/flumotion/extern/fdpass/fdpass.so \
+                   ${libdir}/flumotion/python/flumotion/extern/pytrayicon/*.py* \
+                   ${libdir}/flumotion/python/flumotion/extern/pytrayicon/pytrayicon.so \
                   ${libdir}/flumotion/python/flumotion/manager \
                   ${libdir}/flumotion/python/flumotion/ui \
                   ${libdir}/flumotion/python/flumotion/wizard \
--- a/meta-extras/packages/gypsy/files/fixups.patch
+++ b/meta-extras/packages/gypsy/files/fixups.patch
@@ -1,14 +0,0 @@
---
- docs/reference/Makefile.am |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: gypsy/docs/reference/Makefile.am
-===================================================================
--- gypsy.orig/docs/reference/Makefile.am	2007-10-04 23:04:44.000000000 +0100
-+++ gypsy/docs/reference/Makefile.am	2007-10-04 23:04:53.000000000 +0100
-@@ -82,4 +82,4 @@ include $(top_srcdir)/gtk-doc.make
- 
- # Other files to distribute
- # e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST +=
-+# EXTRA_DIST =
--- a/meta-extras/packages/libol/libol_0.3.18.bb
+++ b/meta-extras/packages/libol/libol_0.3.18.bb
@@ -6,9 +6,3 @@ S = "${WORKDIR}/${PN}-${PV}"

 inherit autotools binconfig

-do_stage() {
-        install -d ${STAGING_INCDIR}/libol
-        install -m 0755 ${S}/src/.libs/libol.so.0.0.0 ${STAGING_LIBDIR}/
-        ln -fs ${STAGING_LIBDIR}/libol.so.0.0.0 ${STAGING_LIBDIR}/libol.so.0
-        install ${S}/src/*.h ${STAGING_INCDIR}/libol/
-}
--- a/meta-extras/packages/libxosd/libxosd_svn.bb
+++ b/meta-extras/packages/libxosd/libxosd_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A library for displaying a TV-like on-screen display in X."
 SECTION = "libs/x11"
 DEPENDS = "virtual/libx11 libxext"
 LICENSE = "LGPL"
-PV = "2.2.15+svn${SRCDATE}"
+PV = "2.2.15+svnr${SRCREV}"
 PR = "r5"

 SRC_URI = "svn://libxosd.svn.sourceforge.net/svnroot/libxosd/source;module=current;proto=https \
@@ -13,12 +13,8 @@ S = "${WORKDIR}/current"

 inherit autotools binconfig

-do_stage() {
-	autotools_stage_all
-}
-
 PACKAGES =+ "${PN}-examples-dbg ${PN}-examples"
 FILES_${PN}-examples = "${bindir}/osd_cat"
-FILES_${PN}-examples-dbg = "${bindir}/.debug/"
+FILES_${PN}-examples-dbg += "${bindir}/.debug/"
 FILES_${PN}-dev += "${bindir}/xosd-config"
 FILES_${PN} = "${libdir}/libxosd.so.*"
--- a/meta-extras/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb
+++ b/meta-extras/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb
--- a/meta-extras/packages/matchbox-applet-light/matchbox-applet-light_svn.bb
+++ b/meta-extras/packages/matchbox-applet-light/matchbox-applet-light_svn.bb
--- a/meta-extras/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb
+++ b/meta-extras/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb
--- a/Show More
+++ b/Show More