bitbake/bin/bitbake:
[vuplus_bitbake] / bin / bitbake
index 7a72888..2a4366a 100755 (executable)
 #
 # Copyright (C) 2003, 2004  Chris Larson
 # Copyright (C) 2003, 2004  Phil Blundell
+# Copyright (C) 2003 - 2005 Michael 'Mickey' Lauer
+# Copyright (C) 2005        Holger Hans Peter Freyther
+# Copyright (C) 2005        ROAD GmbH
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
-# 
+#
 # 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., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA. 
+# Place, Suite 330, Boston, MA 02111-1307 USA.
 
-import sys, os, getopt, glob, copy, os.path, re
+import sys, os, getopt, glob, copy, os.path, re, time
 sys.path.append(os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])), 'lib'))
 import bb
-from bb import make
+from bb import utils, data, parse, debug, event, fatal
 from sets import Set
 import itertools, optparse
 
 parsespin = itertools.cycle( r'|/-\\' )
-
-__version__ = 1.2
-__build_cache_fail = []
-__build_cache = []
-__building_list = []
-__build_path = []
-
-__preferred = {}
-__world_target = Set()
-__ignored_dependencies = Set()
-
-__stats = {}
-
-bbfile_config_priorities = []
-bbfile_priority = {}
 bbdebug = 0
 
-def handle_options( args ):
-    parser = optparse.OptionParser( version = "BitBake Build Tool Core version %s, %%prog version %s" % ( bb.__version__, __version__ ),
-    usage = """%prog [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
-be executed.  BBFILES does support wildcards.
-Default BBFILES are the .bb files in the current directory.""" )
-
-    parser.add_option( "-b", "--buildfile", help = "execute the task against this .bb file, rather than a package from BBFILES.",
-               action = "store", dest = "buildfile", default = None )
-
-    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( "-f", "--force", help = "force run of specified cmd, regardless of stamp status",
-               action = "store_true", dest = "force", default = False )
+__version__ = "1.3.3.1"
+
+#============================================================================#
+# BBParsingStatus
+#============================================================================#
+class BBParsingStatus:
+    """
+    The initial idea for this status class is to use the data when it is
+    already loaded instead of loading it from various place over and over
+    again.
+    """
+
+    def __init__(self):
+        self.cache_dirty = False
+        self.providers   = {}
+        self.rproviders = {}
+        self.packages = {}
+        self.packages_dynamic = {}
+        self.bbfile_priority = {}
+        self.bbfile_config_priorities = []
+        self.ignored_dependencies = None
+        self.possible_world = []
+        self.world_target = Set()
+        self.pkg_pn = {}
+        self.pkg_fn = {}
+        self.pkg_pvpr = {}
+        self.pkg_dp = {}
+        self.pn_provides = {}
+        self.all_depends = Set()
+
+    def handle_bb_data(self, file_name, bb_data, cached):
+        """
+        We will fill the dictionaries with the stuff we
+        need for building the tree more fast
+        """
+        if bb_data == None:
+            return
+
+        if not cached:
+            self.cache_dirty = True
+
+        pn       = bb.data.getVar('PN', bb_data, True)
+        pv       = bb.data.getVar('PV', bb_data, True)
+        pr       = bb.data.getVar('PR', bb_data, True)
+        dp       = int(bb.data.getVar('DEFAULT_PREFERENCE', bb_data, True) or "0")
+        provides = Set([pn] + (bb.data.getVar("PROVIDES", bb_data, 1) or "").split())
+        rprovides = (bb.data.getVar("RPROVIDES", bb_data, 1) or "").split()
+        depends  = (bb.data.getVar("DEPENDS", bb_data, True) or "").split()
+        packages = (bb.data.getVar('PACKAGES', bb_data, True) or "").split()
+        packages_dynamic = (bb.data.getVar('PACKAGES_DYNAMIC', bb_data, True) or "").split()
+
+
+        # build PackageName to FileName lookup table
+        if pn not in self.pkg_pn:
+            self.pkg_pn[pn] = []
+        self.pkg_pn[pn].append(file_name)
+
+        # build FileName to PackageName lookup table
+        self.pkg_fn[file_name] = pn
+        self.pkg_pvpr[file_name] = (pv,pr)
+        self.pkg_dp[file_name] = dp
+
+        # Build forward and reverse provider hashes
+        # Forward: virtual -> [filenames]
+        # Reverse: PN -> [virtuals]
+        if pn not in self.pn_provides:
+            self.pn_provides[pn] = Set()
+        self.pn_provides[pn] |= provides
 
+        for provide in provides:
+            if provide not in self.providers:
+                self.providers[provide] = []
+            self.providers[provide].append(file_name)
 
-    parser.add_option( "-c", "--cmd", help = "Specify task to execute",
-               action = "store", dest = "cmd", default = "build" )
+        for dep in depends:
+            self.all_depends.add(dep)
 
-    parser.add_option( "-r", "--read", help = "read the specified file before bitbake.conf",
-               action = "append", dest = "file", default = [] )
+        # Build reverse hash for PACKAGES, so runtime dependencies 
+        # can be be resolved (RDEPENDS, RRECOMMENDS etc.)
+    
+        for package in packages:
+            if not package in self.packages:
+                self.packages[package] = []
+            self.packages[package].append(file_name)
+
+        for package in packages_dynamic:
+            if not package in self.packages_dynamic:
+                self.packages_dynamic[package] = []
+            self.packages_dynamic[package].append(file_name)
+
+        for rprovide in rprovides:
+            if not rprovide in self.rproviders:
+                self.rproviders[rprovide] = []
+            self.rproviders[rprovide].append(file_name)
+
+        # Collect files we may need for possible world-dep
+        # calculations
+        if not bb.data.getVar('BROKEN', bb_data, True) and not bb.data.getVar('EXCLUDE_FROM_WORLD', bb_data, True):
+            self.possible_world.append(file_name)
+
+
+#============================================================================#
+# BBStatistics
+#============================================================================#
+class BBStatistics:
+    """
+    Manage build statistics for one run
+    """
+    def __init__(self ):
+        self.attempt = 0
+        self.success = 0
+        self.fail = 0
+        self.deps = 0
+
+    def show( self ):
+        print "Build statistics:"
+        print "  Attempted builds: %d" % self.attempt
+        if self.fail:
+            print "  Failed builds: %d" % self.fail
+        if self.deps:
+            print "  Dependencies not satisfied: %d" % self.deps
+        if self.fail or self.deps: return 1
+        else: return 0
+
+
+#============================================================================#
+# BBOptions
+#============================================================================#
+class BBConfiguration( object ):
+    """
+    Manages build options and configurations for one run
+    """
+    def __init__( self, options ):
+        for key, val in options.__dict__.items():
+            setattr( self, key, val )
+        self.data = data.init()
+
+#============================================================================#
+# BBCooker
+#============================================================================#
+class BBCooker:
+    """
+    Manages one bitbake build run
+    """
+
+    ParsingStatus = BBParsingStatus     # make it visible from the shell
+    Statistics = BBStatistics           # make it visible from the shell
+
+    def __init__( self ):
+        self.build_cache_fail = []
+        self.build_cache = []
+        self.rbuild_cache = []
+        self.building_list = []
+        self.build_path = []
+        self.consider_msgs_cache = []
+        self.preferred = {}
+        self.stats = BBStatistics()
+        self.status = None
+
+        self.pkgdata = None
+        self.cache = None
+
+    def tryBuildPackage( self, fn, item, the_data ):
+        """Build one package"""
+        bb.event.fire(bb.event.PkgStarted(item, the_data))
+        try:
+            self.stats.attempt += 1
+            if self.configuration.force:
+                bb.data.setVarFlag('do_%s' % self.configuration.cmd, 'force', 1, the_data)
+            if not self.configuration.dry_run:
+                bb.build.exec_task('do_%s' % self.configuration.cmd, the_data)
+            bb.event.fire(bb.event.PkgSucceeded(item, the_data))
+            self.build_cache.append(fn)
+            return True
+        except bb.build.FuncFailed:
+            self.stats.fail += 1
+            bb.error("task stack execution failed")
+            bb.event.fire(bb.event.PkgFailed(item, the_data))
+            self.build_cache_fail.append(fn)
+            raise
+        except bb.build.EventException, e:
+            self.stats.fail += 1
+            event = e.args[1]
+            bb.error("%s event exception, aborting" % bb.event.getName(event))
+            bb.event.fire(bb.event.PkgFailed(item, the_data))
+            self.build_cache_fail.append(fn)
+            raise
 
-    parser.add_option( "-v", "--verbose", help = "output more chit-chat to the terminal",
-               action = "store_true", dest = "verbose", default = False )
-    parser.add_option( "-D", "--debug", help = "Increase the debug level",
-               action = "count", dest="debug", default = 0)
+    def tryBuild( self, fn, virtual , buildAllDeps , build_depends = []):
+        """
+        Build a provider and its dependencies. 
+        build_depends is a list of previous build dependencies (not runtime)
+        If build_depends is empty, we're dealing with a runtime depends
+        """
 
-    parser.add_option( "-n", "--dry-run", help = "don't execute, just go through the motions",
-               action = "store_true", dest = "dry_run", default = False )
+        the_data = self.pkgdata[fn]
 
-    parser.add_option( "-p", "--parse-only", help = "quit after parsing the BB files (developers only)",
-               action = "store_true", dest = "parse_only", default = False )
+        if not buildAllDeps:
+            buildAllDeps = bb.data.getVar('BUILD_ALL_DEPS', the_data, True) or False
 
-    parser.add_option( "-d", "--disable-psyco", help = "disable using the psyco just-in-time compiler (not recommended)",
-               action = "store_true", dest = "disable_psyco", default = False )
+        # Error on build time dependency loops
+        if build_depends and build_depends.count(fn) > 1:
+            bb.error("%s depends on itself (eventually)" % fn)
+            bb.error("upwards chain is: %s" % (" -> ".join(self.build_path)))
+            return False
 
-    parser.add_option( "-s", "--show-versions", help = "show current and preferred versions of all packages",
-               action = "store_true", dest = "show_versions", default = False )
+        # See if this is a runtime dependency we've already built
+       # Or a build dependency being handled in a different build chain
+        if fn in self.building_list:
+            return self.addRunDeps(fn, virtual , buildAllDeps)
 
-    options, args = parser.parse_args( args )
-    return options, args[1:]
+        item = self.status.pkg_fn[fn]
 
-def try_build(fn, virtual):
-    if fn in __building_list:
-        bb.error("%s depends on itself (eventually)" % fn)
-        bb.error("upwards chain is: %s" % (" -> ".join(__build_path)))
-        return False
+        self.building_list.append(fn)
 
-    the_data = make.pkgdata[fn]
-    item = bb.data.getVar('PN', the_data, 1)
+        pathstr = "%s (%s)" % (item, virtual)
+        self.build_path.append(pathstr)
 
-    if bb.build.stamp_is_current('do_%s' % make.options.cmd, the_data):
-        return True
+        depends_list = (bb.data.getVar('DEPENDS', the_data, True) or "").split()
 
-    __building_list.append(fn)
+        if self.configuration.verbose:
+            bb.note("current path: %s" % (" -> ".join(self.build_path)))
+            bb.note("dependencies for %s are: %s" % (item, " ".join(depends_list)))
 
-    pathstr = "%s (%s)" % (item, virtual)
-    __build_path.append(pathstr)
+        try:
+            failed = False
 
+            depcmd = self.configuration.cmd
+            bbdepcmd = bb.data.getVarFlag('do_%s' % self.configuration.cmd, 'bbdepcmd', the_data)
+            if bbdepcmd is not None:
+                if bbdepcmd == "":
+                    depcmd = None
+                else:
+                    depcmd = bbdepcmd
+
+            if depcmd:
+                oldcmd = self.configuration.cmd
+                self.configuration.cmd = depcmd
+
+            for dependency in depends_list:
+                if dependency in self.status.ignored_dependencies:
+                    continue
+                if not depcmd:
+                    continue
+                if self.buildProvider( dependency , buildAllDeps , build_depends ) == 0:
+                    bb.error("dependency %s (for %s) not satisfied" % (dependency,item))
+                    failed = True
+                    if self.configuration.abort:
+                        break
 
-    depends_list = (bb.data.getVar('DEPENDS', the_data, 1) or "").split()
-    if make.options.verbose:
-        bb.note("current path: %s" % (" -> ".join(__build_path)))
-        bb.note("dependencies for %s are: %s" % (item, " ".join(depends_list)))
+            if depcmd:
+                self.configuration.cmd = oldcmd
 
-    try:
-        failed = False
+            if failed:
+                self.stats.deps += 1
+                return False
 
-        depcmd = make.options.cmd
-        bbdepcmd = bb.data.getVarFlag('do_%s' % make.options.cmd, 'bbdepcmd', make.pkgdata[fn])
-        if bbdepcmd is not None:
-            if bbdepcmd == "":
-                depcmd = None
-            else:
-                depcmd = bbdepcmd
+            if not self.addRunDeps(fn, virtual , buildAllDeps):
+                return False
 
-        if depcmd:
-            oldcmd = make.options.cmd
-            make.options.cmd = depcmd
+            if bb.build.stamp_is_current('do_%s' % self.configuration.cmd, the_data):
+                self.build_cache.append(fn)
+                return True
 
-        for d in depends_list:
-            if d in __ignored_dependencies:
-                continue
-            if not depcmd:
-                continue
-            if buildPackage(d) == 0:
-                bb.error("dependency %s (for %s) not satisfied" % (d,item))
-                failed = True
-                if make.options.abort:
-                    break
+            return self.tryBuildPackage( fn, item, the_data )
 
-        if depcmd:
-            make.options.cmd = oldcmd
+        finally:
+            self.building_list.remove(fn)
+            self.build_path.remove(pathstr)
 
-        if failed:
-            __stats["deps"] += 1
-            return False
+    def findBestProvider( self, pn, pkg_pn = None):
+        """
+        If there is a PREFERRED_VERSION, find the highest-priority bbfile
+        providing that version.  If not, find the latest version provided by
+        an bbfile in the highest-priority set.
+        """
+        if not pkg_pn:
+            pkg_pn = self.status.pkg_pn
 
-        bb.event.fire(bb.event.PkgStarted(item, make.pkgdata[fn]))
-        try:
-            __stats["attempt"] += 1
-            if not make.options.dry_run:
-                bb.build.exec_task('do_%s' % make.options.cmd, make.pkgdata[fn])
-            bb.event.fire(bb.event.PkgSucceeded(item, make.pkgdata[fn]))
-            __build_cache.append(fn)
-            return True
-        except bb.build.FuncFailed:
-            __stats["fail"] += 1
-            bb.error("task stack execution failed")
-            bb.event.fire(bb.event.PkgFailed(item, make.pkgdata[fn]))
-            __build_cache_fail.append(fn)
-            raise
-        except bb.build.EventException:
-            __stats["fail"] += 1
-            (type, value, traceback) = sys.exc_info()
-            e = value.event
-            bb.error("%s event exception, aborting" % bb.event.getName(e))
-            bb.event.fire(bb.event.PkgFailed(item, make.pkgdata[fn]))
-            __build_cache_fail.append(fn)
-            raise
-    finally:
-        __building_list.remove(fn)
-        __build_path.remove(pathstr)
-
-def showVersions():
-    pkg_pn = {}
-    preferred_versions = {}
-    latest_versions = {}
-
-    for p in make.pkgdata.keys():
-        pn = bb.data.getVar('PN', make.pkgdata[p], 1)
-        if not pkg_pn.has_key(pn):
-            pkg_pn[pn] = []
-        pkg_pn[pn].append(p)
-    
-    # Sort by priority
-    for pn in pkg_pn.keys():
         files = pkg_pn[pn]
         priorities = {}
         for f in files:
-            priority = bbfile_priority[f]
-            if not priorities.has_key(priority):
+            priority = self.status.bbfile_priority[f]
+            if priority not in priorities:
                 priorities[priority] = []
             priorities[priority].append(f)
         p_list = priorities.keys()
         p_list.sort(lambda a, b: a - b)
-        pkg_pn[pn] = []
+        tmp_pn = []
         for p in p_list:
-            pkg_pn[pn] = [ priorities[p] ] + pkg_pn[pn]
+            tmp_pn = [priorities[p]] + tmp_pn
 
-    # If there is a PREFERRED_VERSION, find the highest-priority bbfile providing that
-    # version.  If not, find the latest version provided by an bbfile in the
-    # highest-priority set.
-    for pn in pkg_pn.keys():
         preferred_file = None
-        
-        preferred_v = bb.data.getVar('PREFERRED_VERSION_%s' % pn, make.cfg, 1)
+
+        localdata = data.createCopy(self.configuration.data)
+        bb.data.setVar('OVERRIDES', "%s:%s" % (pn, data.getVar('OVERRIDES', localdata)), localdata)
+        bb.data.update_data(localdata)
+
+        preferred_v = bb.data.getVar('PREFERRED_VERSION_%s' % pn, localdata, True)
         if preferred_v:
-            preferred_r = None
             m = re.match('(.*)_(.*)', preferred_v)
             if m:
                 preferred_v = m.group(1)
                 preferred_r = m.group(2)
-                
-            for file_set in pkg_pn[pn]:
+            else:
+                preferred_r = None
+
+            for file_set in tmp_pn:
                 for f in file_set:
-                    the_data = make.pkgdata[f]
-                    pv = bb.data.getVar('PV', the_data, 1)
-                    pr = bb.data.getVar('PR', the_data, 1)
+                    pv,pr = self.status.pkg_pvpr[f]
                     if preferred_v == pv and (preferred_r == pr or preferred_r == None):
                         preferred_file = f
                         preferred_ver = (pv, pr)
                         break
                 if preferred_file:
-                    break
+                    break;
             if preferred_r:
                 pv_str = '%s-%s' % (preferred_v, preferred_r)
             else:
@@ -229,509 +355,766 @@ def showVersions():
                 bb.note("preferred version %s of %s not available" % (pv_str, pn))
             else:
                 bb.debug(1, "selecting %s as PREFERRED_VERSION %s of package %s" % (preferred_file, pv_str, pn))
-               
+
+        del localdata
+
         # get highest priority file set
-        files = pkg_pn[pn][0]
+        files = tmp_pn[0]
         latest = None
         latest_p = 0
         latest_f = None
-        for f in files:
-            the_data = make.pkgdata[f]
-            pv = bb.data.getVar('PV', the_data, 1)
-            pr = bb.data.getVar('PR', the_data, 1)
-            dp = int(bb.data.getVar('DEFAULT_PREFERENCE', the_data, 1) or "0")
+        for file_name in files:
+            pv,pr = self.status.pkg_pvpr[file_name]
+            dp = self.status.pkg_dp[file_name]
 
-            if (latest is None) or ((latest_p == dp) and (make.vercmp(latest, (pv, pr)) < 0)) or (dp > latest_p):
+            if (latest is None) or ((latest_p == dp) and (utils.vercmp(latest, (pv, pr)) < 0)) or (dp > latest_p):
                 latest = (pv, pr)
-                latest_f = f
+                latest_f = file_name
                 latest_p = dp
         if preferred_file is None:
             preferred_file = latest_f
             preferred_ver = latest
-            
-        preferred_versions[pn] = (preferred_ver, preferred_file)
-        latest_versions[pn] = (latest, latest_f)
 
-    pkg_list = pkg_pn.keys()
-    pkg_list.sort()
-    
-    for p in pkg_list:
-        pref = preferred_versions[p]
-        latest = latest_versions[p]
+        return (latest,latest_f,preferred_ver, preferred_file)
 
-        if pref != latest:
-            prefstr = pref[0][0] + "-" + pref[0][1]
-        else:
-            prefstr = ""
+    def showVersions( self ):
+        pkg_pn = self.status.pkg_pn
+        preferred_versions = {}
+        latest_versions = {}
 
-        print "%-30s %20s %20s" % (p, latest[0][0] + "-" + latest[0][1],
-                                   prefstr)
+        # Sort by priority
+        for pn in pkg_pn.keys():
+            (last_ver,last_file,pref_ver,pref_file) = self.findBestProvider(pn)
+            preferred_versions[pn] = (pref_ver, pref_file)
+            latest_versions[pn] = (last_ver, last_file)
 
-__consider_msgs_cache = []
-def buildPackage(item):
-    fn = None
+        pkg_list = pkg_pn.keys()
+        pkg_list.sort()
 
-    discriminated = False
+        for p in pkg_list:
+            pref = preferred_versions[p]
+            latest = latest_versions[p]
 
-    if not providers.has_key(item):
-        bb.error("Nothing provides %s" % item)
-        return 0
+            if pref != latest:
+                prefstr = pref[0][0] + "-" + pref[0][1]
+            else:
+                prefstr = ""
 
-    all_p = providers[item]
+            print "%-30s %20s %20s" % (p, latest[0][0] + "-" + latest[0][1],
+                                        prefstr)
 
-    for p in all_p:
-        if p in __build_cache:
-            bb.debug(1, "already built %s in this run\n" % p)
-            return 1
+    def showEnvironment( self ):
+        """Show the outer or per-package environment"""
+        if self.configuration.buildfile:
+            try:
+                self.configuration.data, fromCache = self.load_bbfile( self.configuration.buildfile )
+            except IOError, e:
+                fatal("Unable to read %s: %s" % ( self.configuration.buildfile, e ))
+            except Exception, e:
+                fatal("%s" % e)
+        # emit variables and shell functions
+        try:
+            data.update_data( self.configuration.data )
+            data.emit_env(sys.__stdout__, self.configuration.data, True)
+        except Exception, e:
+            fatal("%s" % e)
+        # emit the metadata which isnt valid shell
+        for e in self.configuration.data.keys():
+            if data.getVarFlag( e, 'python', self.configuration.data ):
+                sys.__stdout__.write("\npython %s () {\n%s}\n" % (e, data.getVar(e, self.configuration.data, 1)))
+
+    def filterProviders(self, providers, item):
+        """
+        Take a list of providers and filter/reorder according to the 
+        environment variables and previous build results
+        """
+        eligible = []
+        preferred_versions = {}
+
+        # Collate providers by PN
+        pkg_pn = {}
+        for p in providers:
+            pn = self.status.pkg_fn[p]
+            if pn not in pkg_pn:
+                pkg_pn[pn] = []
+            pkg_pn[pn].append(p)
+
+        bb.debug(1, "providers for %s are: %s" % (item, pkg_pn.keys()))
+
+        for pn in pkg_pn.keys():
+            preferred_versions[pn] = self.findBestProvider(pn, pkg_pn)[2:4]
+            eligible.append(preferred_versions[pn][1])
 
-    eligible = []
-    preferred_versions = {}
+        for p in eligible:
+            if p in self.build_cache_fail:
+                bb.debug(1, "rejecting already-failed %s" % p)
+                eligible.remove(p)
 
-    # Collate providers by PN
-    pkg_pn = {}
-    for p in all_p:
-        the_data = make.pkgdata[p]
-        pn = bb.data.getVar('PN', the_data, 1)
-        if not pkg_pn.has_key(pn):
-            pkg_pn[pn] = []
-        pkg_pn[pn].append(p)
+        if len(eligible) == 0:
+            bb.error("no eligible providers for %s" % item)
+            return 0
 
-    bb.debug(1, "providers for %s are: %s" % (item, pkg_pn.keys()))
+        # 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:
+            the_data = self.pkgdata[p]
+            pn = bb.data.getVar('PN', the_data, 1)
+            pv = bb.data.getVar('PV', the_data, 1)
+            pr = bb.data.getVar('PR', the_data, 1)
+            stamp = '%s.do_populate_staging' % bb.data.getVar('STAMP', the_data, 1)
+            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)
+                newver = '-'.join(newvers)
+                if (newver != oldver):
+                    extra_chat = "; upgrading from %s to %s" % (oldver, newver)
+                else:
+                    extra_chat = ""
+                if self.configuration.verbose:
+                    bb.note("selecting already-staged %s to satisfy %s%s" % (pn, item, extra_chat))
+                eligible.remove(fn)
+                eligible = [fn] + eligible
+                discriminated = True
+                break
 
-    # Sort by priority
-    for pn in pkg_pn.keys():
-        files = pkg_pn[pn]
-        priorities = {}
-        for f in files:
-            priority = bbfile_priority[f]
-            if not priorities.has_key(priority):
-                priorities[priority] = []
-            priorities[priority].append(f)
-        p_list = priorities.keys()
-        p_list.sort(lambda a, b: a - b)
-        pkg_pn[pn] = []
-        for p in p_list:
-            pkg_pn[pn] = [ priorities[p] ] + pkg_pn[pn]
+        return eligible
 
-    # If there is a PREFERRED_VERSION, find the highest-priority bbfile providing that
-    # version.  If not, find the latest version provided by an bbfile in the
-    # highest-priority set.
-    for pn in pkg_pn.keys():
-        preferred_file = None
-        
-        preferred_v = bb.data.getVar('PREFERRED_VERSION_%s' % pn, make.cfg, 1)
-        if preferred_v:
-            preferred_r = None
-            m = re.match('(.*)_(.*)', preferred_v)
-            if m:
-                preferred_v = m.group(1)
-                preferred_r = m.group(2)
-                
-            for file_set in pkg_pn[pn]:
-                for f in file_set:
-                    the_data = make.pkgdata[f]
-                    pv = bb.data.getVar('PV', the_data, 1)
-                    pr = bb.data.getVar('PR', the_data, 1)
-                    if preferred_v == pv and (preferred_r == pr or preferred_r == None):
-                        preferred_file = f
-                        preferred_ver = (pv, pr)
-                        break
-                if preferred_file:
+    def buildProvider( self, item , buildAllDeps , build_depends = [] ):
+        """
+        Build something to provide a named build requirement
+        (takes item names from DEPENDS namespace)
+        """
+
+        fn = None
+        discriminated = False
+
+        if not item in self.status.providers:
+            bb.error("Nothing provides dependency %s" % item)
+            return 0
+
+        all_p = self.status.providers[item]
+
+        for p in all_p:
+            if p in self.build_cache:
+                bb.debug(1, "already built %s in this run\n" % p)
+                return 1
+
+        eligible = self.filterProviders(all_p, item)
+
+        if not eligible:
+            return 0
+
+        prefervar = bb.data.getVar('PREFERRED_PROVIDER_%s' % item, self.configuration.data, 1)
+        if prefervar:
+            self.preferred[item] = prefervar
+
+        if item in self.preferred:
+            for p in eligible:
+                pn = self.status.pkg_fn[p]
+                if self.preferred[item] == pn:
+                    if self.configuration.verbose:
+                        bb.note("selecting %s to satisfy %s due to PREFERRED_PROVIDERS" % (pn, item))
+                    eligible.remove(p)
+                    eligible = [p] + eligible
+                    discriminated = True
                     break
-            if preferred_r:
-                pv_str = '%s-%s' % (preferred_v, preferred_r)
-            else:
-                pv_str = preferred_v
-            if preferred_file is None:
-                bb.note("preferred version %s of %s not available" % (pv_str, pn))
-            else:
-                bb.debug(1, "selecting %s as PREFERRED_VERSION %s of package %s" % (preferred_file, pv_str, pn))
-                
-        if preferred_file is None:
-            # get highest priority file set
-            files = pkg_pn[pn][0]
-            latest = None
-            latest_p = 0
-            latest_f = None
-            for f in files:
-                the_data = make.pkgdata[f]
-                pv = bb.data.getVar('PV', the_data, 1)
-                pr = bb.data.getVar('PR', the_data, 1)
-                dp = int(bb.data.getVar('DEFAULT_PREFERENCE', the_data, 1) or "0")
-
-                if (latest is None) or ((latest_p == dp) and (make.vercmp(latest, (pv, pr)) < 0)) or (dp > latest_p):
-                    latest = (pv, pr)
-                    latest_f = f
-                    latest_p = dp
-            preferred_file = latest_f
-            preferred_ver = latest
-            
-            bb.debug(1, "selecting %s as latest version of provider %s" % (preferred_file, pn))
 
-        preferred_versions[pn] = (preferred_ver, preferred_file)
-        eligible.append(preferred_file)
+        if len(eligible) > 1 and discriminated == False:
+            if item not in self.consider_msgs_cache:
+                providers_list = []
+                for fn in eligible:
+                    providers_list.append(self.status.pkg_fn[fn])
+                bb.note("multiple providers are available (%s);" % ", ".join(providers_list))
+                bb.note("consider defining PREFERRED_PROVIDER_%s" % item)
+            self.consider_msgs_cache.append(item)
+
 
-    for p in eligible:
-        if p in __build_cache_fail:
-            bb.debug(1, "rejecting already-failed %s" % p)
-            eligible.remove(p)
+        # run through the list until we find one that we can build
+        for fn in eligible:
+            bb.debug(2, "selecting %s to satisfy %s" % (fn, item))
+            if self.tryBuild(fn, item, buildAllDeps, build_depends + [fn]):
+                return 1
 
-    if len(eligible) == 0:
-        bb.error("no eligible providers for %s" % item)
+        bb.note("no buildable providers for %s" % item)
         return 0
 
-    # 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 all_p:
-        the_data = make.pkgdata[p]
-        pn = bb.data.getVar('PN', the_data, 1)
-        pv = bb.data.getVar('PV', the_data, 1)
-        pr = bb.data.getVar('PR', the_data, 1)
-        tmpdir = bb.data.getVar('TMPDIR', the_data, 1)
-        stamp = '%s/stamps/%s-%s-%s.do_populate_staging' % (tmpdir, pn, pv, pr)
-        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)
-            newver = '-'.join(newvers)
-            if (newver != oldver):
-                extra_chat = "; upgrading from %s to %s" % (oldver, newver)
-            else:
-                extra_chat = ""
-            if make.options.verbose:
-                bb.note("selecting already-staged %s to satisfy %s%s" % (pn, item, extra_chat))
-            eligible.remove(fn)
-            eligible = [fn] + eligible
-            discriminated = True
-            break
-
-    prefervar = bb.data.getVar('PREFERRED_PROVIDER_%s' % item, make.cfg, 1)
-    if prefervar:
-        __preferred[item] = prefervar
-
-    if __preferred.has_key(item):
+    def buildRProvider( self, item , buildAllDeps ):
+        """
+        Build something to provide a named runtime requirement
+        (takes item names from RDEPENDS/PACKAGES namespace)
+        """
+
+        fn = None
+        all_p = []
+        discriminated = False
+
+        if not buildAllDeps:
+            return True
+
+        all_p = self.getProvidersRun(item)
+
+        if not all_p:
+            bb.error("Nothing provides runtime dependency %s" % (item))
+            return False
+
+        for p in all_p:
+            if p in self.rbuild_cache:
+                bb.debug(2, "Already built %s providing runtime %s\n" % (p,item))
+                return True
+            if p in self.build_cache:
+                bb.debug(2, "Already built %s but adding any further RDEPENDS for %s\n" % (p, item))
+                return self.addRunDeps(p, item , buildAllDeps)
+
+        eligible = self.filterProviders(all_p, item)
+        if not eligible:
+            return 0
+
+        preferred = []
         for p in eligible:
-            the_data = make.pkgdata[p]
-            pn = bb.data.getVar('PN', the_data, 1)
-            if __preferred[item] == pn:
-                if make.options.verbose:
-                    bb.note("selecting %s to satisfy %s due to PREFERRED_PROVIDERS" % (pn, item))
-                eligible.remove(p)
-                eligible = [p] + eligible
-                discriminated = True
-                break
+            pn = self.status.pkg_fn[p]
+            provides = self.status.pn_provides[pn]
+            for provide in provides:
+                prefervar = bb.data.getVar('PREFERRED_PROVIDER_%s' % provide, self.configuration.data, 1)
+                if prefervar == pn:
+                    if self.configuration.verbose:
+                        bb.note("selecting %s to satisfy runtime %s due to PREFERRED_PROVIDERS" % (pn, item))
+                    eligible.remove(p)
+                    eligible = [p] + eligible
+                    preferred.append(p)
+
+        if len(eligible) > 1 and len(preferred) == 0:
+            if item not in self.consider_msgs_cache:
+                providers_list = []
+                for fn in eligible:
+                    providers_list.append(self.status.pkg_fn[fn])
+                bb.note("multiple providers are available (%s);" % ", ".join(providers_list))
+                bb.note("consider defining a PREFERRED_PROVIDER to match runtime %s" % item)
+            self.consider_msgs_cache.append(item)
+
+        if len(preferred) > 1:
+            if item not in self.consider_msgs_cache:
+                providers_list = []
+                for fn in preferred:
+                    providers_list.append(self.status.pkg_fn[fn])
+                bb.note("multiple preferred providers are available (%s);" % ", ".join(providers_list))
+                bb.note("consider defining only one PREFERRED_PROVIDER to match runtime %s" % item)
+            self.consider_msgs_cache.append(item)
+
+        # run through the list until we find one that we can build
+        for fn in eligible:
+            bb.debug(2, "selecting %s to satisfy runtime %s" % (fn, item))
+            if self.tryBuild(fn, item, buildAllDeps):
+                return True
+
+        bb.error("No buildable providers for runtime %s" % item)
+        return False
 
-    if len(eligible) > 1 and discriminated == False:
-        if item not in __consider_msgs_cache:
-            providers_list = []
-            for fn in eligible:
-                providers_list.append(bb.data.getVar('PN', make.pkgdata[fn], 1))
-            bb.note("multiple providers are available (%s);" % ", ".join(providers_list))
-            bb.note("consider defining PREFERRED_PROVIDER_%s" % item)
-        __consider_msgs_cache.append(item)
+    def getProvidersRun(self, rdepend):
+        """
+        Return any potential providers of runtime rdepend
+        """
+        rproviders = []
 
+        if rdepend in self.status.rproviders:
+            rproviders += self.status.rproviders[rdepend]
 
-    # run through the list until we find one that we can build
-    for fn in eligible:
-        bb.debug(2, "selecting %s to satisfy %s" % (fn, item))
-        if try_build(fn, item):
-            return 1
+        if rdepend in self.status.packages:
+            rproviders += self.status.packages[rdepend]
 
-    bb.note("no buildable providers for %s" % item)
-    return 0
+        if rproviders:
+            return rproviders
 
-def build_depgraph():
-    all_depends = Set()
-    pn_provides = {}
+        # Only search dynamic packages if we can't find anything in other variables
+        for pattern in self.status.packages_dynamic:
+            regexp = re.compile(pattern)
+            if regexp.match(rdepend):
+                rproviders += self.status.packages_dynamic[pattern]
 
-    def progress(p):
-        if bbdebug or progress.p == p: return 
-        progress.p = p
-        if os.isatty(sys.stdout.fileno()):
-            sys.stdout.write("\rNOTE: Building provider hash: [%s%s] (%02d%%)" % ( "#" * (p/5), " " * ( 20 - p/5 ), p ) )
-            sys.stdout.flush()
-        else:
-            if p == 0:
-                sys.stdout.write("NOTE: Building provider hash, please wait...\n")
-            if p == 100:
-                sys.stdout.write("done.\n")
-    progress.p = 0
-
-    def calc_bbfile_priority(filename):
-        for (regex, pri) in bbfile_config_priorities:
-            if regex.match(filename):
-                return pri
-        return 0
+        return rproviders
 
-    # Handle PREFERRED_PROVIDERS
-    for p in (bb.data.getVar('PREFERRED_PROVIDERS', make.cfg, 1) or "").split():
-        (providee, provider) = p.split(':')
-        if __preferred.has_key(providee) and __preferred[providee] != provider:
-            bb.error("conflicting preferences for %s: both %s and %s specified" % (providee, provider, __preferred[providee]))
-        __preferred[providee] = provider
+    def addRunDeps(self , fn, item , buildAllDeps):
+        """
+        Add any runtime dependencies of runtime item provided by fn 
+        as long as item has't previously been processed by this function.
+        """
 
-    # Calculate priorities for each file
-    for p in make.pkgdata.keys():
-        bbfile_priority[p] = calc_bbfile_priority(p)
-    
-    n = len(make.pkgdata.keys())
-    i = 0
+        if item in self.rbuild_cache:
+            return True
 
-    op = -1
+        if not buildAllDeps:
+            return True
 
-    bb.debug(1, "building providers hashes")
+        rdepends = []
+        self.rbuild_cache.append(item)
+        the_data = self.pkgdata[fn]
+        pn = self.status.pkg_fn[fn]
 
-    # Build forward and reverse provider hashes
-    # Forward: virtual -> [filenames]
-    # Reverse: PN -> [virtuals]
-    for f in make.pkgdata.keys():
-        d = make.pkgdata[f]
+        if (item == pn):
+            rdepends += bb.utils.explode_deps(bb.data.getVar('RDEPENDS', the_data, True) or "")
+            rdepends += bb.utils.explode_deps(bb.data.getVar('RRECOMMENDS', the_data, True) or "")
+        else:
+            packages = (bb.data.getVar('PACKAGES', the_data, 1).split() or "")
+            for package in packages:
+                if package == item:
+                    rdepends += bb.utils.explode_deps(bb.data.getVar("RDEPENDS_%s" % package, the_data, True) or "")
+                    rdepends += bb.utils.explode_deps(bb.data.getVar("RRECOMMENDS_%s" % package, the_data, True) or "")
 
-        pn = bb.data.getVar('PN', d, 1)
-        provides = Set([pn] + (bb.data.getVar("PROVIDES", d, 1) or "").split())
+        bb.debug(2, "Additional runtime dependencies for %s are: %s" % (item, " ".join(rdepends)))
 
-        if not pn_provides.has_key(pn):
-            pn_provides[pn] = Set()
-        pn_provides[pn] |= provides
+        for rdepend in rdepends:  
+            if not self.buildRProvider(rdepend, buildAllDeps):
+                return False
+        return True
 
-        for provide in provides:
-            if not providers.has_key(provide):
-                providers[provide] = []
-            providers[provide].append(f)
-
-        deps = (bb.data.getVar("DEPENDS", d, 1) or "").split()
-        for dep in deps:
-            all_depends.add(dep)
-
-        i += 1
-        p = (100 * i) / n
-        if p != op:
-            op = p
-            progress(p)
-
-    if bbdebug == 0:
-        sys.stdout.write("\n")
-
-    # Build package list for "bitbake world"
-    bb.debug(1, "collating packages for \"world\"")
-    for f in make.pkgdata.keys():
-        d = make.pkgdata[f]
-        if bb.data.getVar('BROKEN', d, 1) or bb.data.getVar('EXCLUDE_FROM_WORLD', d, 1):
-            bb.debug(2, "skipping %s due to BROKEN/EXCLUDE_FROM_WORLD" % f)
-            continue
-        terminal = True
-        pn = bb.data.getVar('PN', d, 1)
-        for p in pn_provides[pn]:
-            if p.startswith('virtual/'):
-                bb.debug(2, "skipping %s due to %s provider starting with virtual/" % (f, p))
-                terminal = False
-                break
-            for pf in providers[p]:
-                if bb.data.getVar('PN', make.pkgdata[pf], 1) != pn:
-                    bb.debug(2, "skipping %s due to both us and %s providing %s" % (f, pf, p))
+    def buildDepgraph( self ):
+        all_depends = self.status.all_depends
+        pn_provides = self.status.pn_provides
+
+        def calc_bbfile_priority(filename):
+            for (regex, pri) in self.status.bbfile_config_priorities:
+                if regex.match(filename):
+                    return pri
+            return 0
+
+        # Handle PREFERRED_PROVIDERS
+        for p in (bb.data.getVar('PREFERRED_PROVIDERS', self.configuration.data, 1) or "").split():
+            (providee, provider) = p.split(':')
+            if providee in self.preferred and self.preferred[providee] != provider:
+                bb.error("conflicting preferences for %s: both %s and %s specified" % (providee, provider, self.preferred[providee]))
+            self.preferred[providee] = provider
+
+        # Calculate priorities for each file
+        for p in self.pkgdata.keys():
+            self.status.bbfile_priority[p] = calc_bbfile_priority(p)
+
+        # Build package list for "bitbake world"
+        bb.debug(1, "collating packages for \"world\"")
+        for f in self.status.possible_world:
+            terminal = True
+            pn = self.status.pkg_fn[f]
+
+            for p in pn_provides[pn]:
+                if p.startswith('virtual/'):
+                    bb.debug(2, "skipping %s due to %s provider starting with virtual/" % (f, p))
                     terminal = False
                     break
-        if terminal:
-            __world_target.add(pn)
-
-def myProgressCallback( x, y, f ):
-    if bbdebug > 0:
-        return
-    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.")
+                for pf in self.status.providers[p]:
+                    if self.status.pkg_fn[pf] != pn:
+                        bb.debug(2, "skipping %s due to both us and %s providing %s" % (f, pf, p))
+                        terminal = False
+                        break
+            if terminal:
+                self.status.world_target.add(pn)
+
+            # drop reference count now
+            self.status.possible_world = None
+            self.status.all_depends    = None
+
+    def myProgressCallback( self, x, y, f, file_data, from_cache ):
+        # feed the status with new input
+        self.status.handle_bb_data(f, file_data, from_cache)
+
+        if bbdebug > 0:
+            return
+        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()
+
+    def interactiveMode( self ):
+        """Drop off into a shell"""
+        try:
+            from bb import shell
+        except ImportError, details:
+            bb.fatal("Sorry, shell not available (%s)" % details )
+        else:
+            bb.data.update_data( self.configuration.data )
+            shell.start( self )
+            sys.exit( 0 )
 
-def executeOneBB( fn ):
+    def parseConfigurationFile( self, afile ):
         try:
-            d = bb.parse.handle(fn, make.cfg)
+            self.configuration.data = bb.parse.handle( afile, self.configuration.data )
         except IOError:
-            bb.fatal("Unable to open %s" % fn)
+            bb.fatal( "Unable to open %s" % afile )
+        except bb.parse.ParseError, details:
+            bb.fatal( "Unable to parse %s (%s)" % (afile, details) )
+
+    def handleCollections( self, collections ):
+        """Handle collections"""
+        if collections:
+            collection_list = collections.split()
+            for c in collection_list:
+                regex = bb.data.getVar("BBFILE_PATTERN_%s" % c, self.configuration.data, 1)
+                if regex == None:
+                    bb.error("BBFILE_PATTERN_%s not defined" % c)
+                    continue
+                priority = bb.data.getVar("BBFILE_PRIORITY_%s" % c, self.configuration.data, 1)
+                if priority == None:
+                    bb.error("BBFILE_PRIORITY_%s not defined" % c)
+                    continue
+                try:
+                    cre = re.compile(regex)
+                except re.error:
+                    bb.error("BBFILE_PATTERN_%s \"%s\" is not a valid regular expression" % (c, regex))
+                    continue
+                try:
+                    pri = int(priority)
+                    self.status.bbfile_config_priorities.append((cre, pri))
+                except ValueError:
+                    bb.error("invalid value for BBFILE_PRIORITY_%s: \"%s\"" % (c, priority))
+
+
+    def cook( self, configuration, args ):
+        self.configuration = configuration
+
+        if not self.configuration.cmd:
+            self.configuration.cmd = "build"
+
+        if self.configuration.debug:
+            bb.debug_level = self.configuration.debug
+
+        self.configuration.data = bb.data.init()
+
+        for f in self.configuration.file:
+            self.parseConfigurationFile( f )
+
+        self.parseConfigurationFile( os.path.join( "conf", "bitbake.conf" ) )
+
+        if self.configuration.show_environment:
+            self.showEnvironment()
+            sys.exit( 0 )
+
+        # inject custom variables
+        if not bb.data.getVar("BUILDNAME", self.configuration.data):
+            bb.data.setVar("BUILDNAME", os.popen('date +%Y%m%d%H%M').readline().strip(), self.configuration.data)
+        bb.data.setVar("BUILDSTART", time.strftime('%m/%d/%Y %H:%M:%S',time.gmtime()),self.configuration.data)
+
+        buildname = bb.data.getVar("BUILDNAME", self.configuration.data)
+
+        if self.configuration.interactive:
+            self.interactiveMode()
+
+        if self.configuration.buildfile is not None:
+            bf = os.path.abspath( self.configuration.buildfile )
+            try:
+                bbfile_data = bb.parse.handle(bf, self.configuration.data)
+            except IOError:
+                bb.fatal("Unable to open %s" % bf)
 
-        if make.options.parse_only:
-            print "Requested parsing .bb files only.  Exiting."
-            sys.exit(0)
+            item = bb.data.getVar('PN', bbfile_data, 1)
+            try:
+                self.tryBuildPackage( bf, item, bbfile_data )
+            except bb.build.EventException:
+                bb.error( "Build of '%s' failed" % item )
 
-        name = bb.data.getVar('PN', d, 1)
-        bb.event.fire(bb.event.PkgStarted(name, d))
-        try:
-            __stats["attempt"] += 1
-            if make.options.force:         
-               bb.data.setVarFlag('do_%s' % make.options.cmd, 'force', 1, d)
-            if not make.options.dry_run:
-                bb.build.exec_task('do_%s' % make.options.cmd, d)
-            bb.event.fire(bb.event.PkgSucceeded(name, d))
-            __build_cache.append(fn)
-        except bb.build.FuncFailed:
-            __stats["fail"] += 1
-            bb.error("task stack execution failed")
-            bb.event.fire(bb.event.PkgFailed(name, d))
-            __build_cache_fail.append(fn)
-        except bb.build.EventException:
-            __stats["fail"] += 1
-            (type, value, traceback) = sys.exc_info()
-            e = value.event
-            bb.error("%s event exception, aborting" % bb.event.getName(e))
-            bb.event.fire(bb.event.PkgFailed(name, d))
-            __build_cache_fail.append(fn)
+            sys.exit( self.stats.show() )
 
-#
-# main
-#
+        # initialise the parsing status now we know we will need deps
+        self.status = BBParsingStatus()
 
-__stats["attempt"] = 0
-__stats["success"] = 0
-__stats["fail"] = 0
-__stats["deps"] = 0
-
-def printStats( ):
-    print "Build statistics:"
-    print "  Attempted builds: %d" % __stats["attempt"]
-    if __stats["fail"] != 0:
-        print "  Failed builds: %d" % __stats["fail"]
-    if __stats["deps"] != 0:
-        print "  Dependencies not satisfied: %d" % __stats["deps"]
-    if __stats["fail"] != 0 or __stats["deps"] != 0:
-        sys.exit(1)
-    sys.exit(0)
+        ignore = bb.data.getVar("ASSUME_PROVIDED", self.configuration.data, 1) or ""
+        self.status.ignored_dependencies = Set( ignore.split() )
 
-if __name__ == "__main__":
+        self.handleCollections( bb.data.getVar("BBFILE_COLLECTIONS", self.configuration.data, 1) )
 
-    make.options, args = handle_options( sys.argv )
+        pkgs_to_build = None
+        if args:
+            if not pkgs_to_build:
+                pkgs_to_build = []
+            pkgs_to_build.extend(args)
+        if not pkgs_to_build:
+                bbpkgs = bb.data.getVar('BBPKGS', self.configuration.data, 1)
+                if bbpkgs:
+                        pkgs_to_build = bbpkgs.split()
+        if not pkgs_to_build and not self.configuration.show_versions \
+                             and not self.configuration.interactive \
+                             and not self.configuration.show_environment:
+                print "Nothing to do.  Use 'bitbake world' to build everything, or run 'bitbake --help'"
+                print "for usage information."
+                sys.exit(0)
+
+        # Import Psyco if available and not disabled
+        if not self.configuration.disable_psyco:
+            try:
+                import psyco
+            except ImportError:
+                if bbdebug == 0:
+                    bb.note("Psyco JIT Compiler (http://psyco.sf.net) not available. Install it to increase performance.")
+            else:
+                psyco.bind( self.collect_bbfiles )
+        else:
+            bb.note("You have disabled Psyco. This decreases performance.")
 
-    if not make.options.cmd:
-        make.options.cmd = "build"
+        try:
+            bb.debug(1, "collecting .bb files")
+            self.collect_bbfiles( self.myProgressCallback )
+            bb.debug(1, "parsing complete")
+            if bbdebug == 0:
+                print
+            if self.configuration.parse_only:
+                print "Requested parsing .bb files only.  Exiting."
+                return
+
+            bb.data.update_data( self.configuration.data )
+            self.buildDepgraph()
+
+            if self.configuration.show_versions:
+                self.showVersions()
+                sys.exit( 0 )
+            if 'world' in pkgs_to_build:
+                pkgs_to_build.remove('world')
+                for t in self.status.world_target:
+                    pkgs_to_build.append(t)
+
+            bb.event.fire(bb.event.BuildStarted(buildname, pkgs_to_build, self.configuration.data))
+
+            for k in pkgs_to_build:
+                failed = False
+                try:
+                    if self.buildProvider( k , False ) == 0:
+                        # already diagnosed
+                        failed = True
+                except bb.build.EventException:
+                    bb.error("Build of " + k + " failed")
+                    failed = True
 
-    if make.options.debug:
-        bb.debug_level = make.options.debug
+                if failed:
+                    if self.configuration.abort:
+                        sys.exit(1)
 
-    make.pkgdata = {}
-    make.cfg = bb.data.init()
-    providers = {}
+            bb.event.fire(bb.event.BuildCompleted(buildname, pkgs_to_build, self.configuration.data))
 
-    for f in make.options.file:
-        try:
-            make.cfg = bb.parse.handle(f, make.cfg)
-        except IOError:
-            bb.fatal("Unable to open %s" % f)
+            sys.exit( self.stats.show() )
 
-    try:
-        make.cfg = bb.parse.handle(os.path.join('conf', 'bitbake.conf'), make.cfg)
-    except IOError:
-        bb.fatal("Unable to open %s" % os.path.join('conf', 'bitbake.conf'))
+        except KeyboardInterrupt:
+            print "\nNOTE: KeyboardInterrupt - Build not completed."
+            sys.exit(1)
 
-    if not bb.data.getVar("BUILDNAME", make.cfg):
-        bb.data.setVar("BUILDNAME", os.popen('date +%Y%m%d%H%M').readline().strip(), make.cfg)
+    def get_bbfiles( self, path = os.getcwd() ):
+        """Get list of default .bb files by reading out the current directory"""
+        contents = os.listdir(path)
+        bbfiles = []
+        for f in contents:
+            (root, ext) = os.path.splitext(f)
+            if ext == ".bb":
+                bbfiles.append(os.path.abspath(os.path.join(os.getcwd(),f)))
+        return bbfiles
 
-    buildname = bb.data.getVar("BUILDNAME", make.cfg)
+    def find_bbfiles( self, path ):
+        """Find all the .bb files in a directory (uses find)"""
+        findcmd = 'find ' + path + ' -name *.bb | grep -v SCCS/'
+        try:
+            finddata = os.popen(findcmd)
+        except OSError:
+            return []
+        return finddata.readlines()
+
+    def deps_clean(self, d):
+        depstr = data.getVar('__depends', d)
+        if depstr:
+            deps = depstr.split(" ")
+            for dep in deps:
+                (f,old_mtime_s) = dep.split("@")
+                old_mtime = int(old_mtime_s)
+                new_mtime = parse.cached_mtime(f)
+                if (new_mtime > old_mtime):
+                    return False
+        return True
 
-    bf = make.options.buildfile
-    if bf:
-        executeOneBB( os.path.abspath(bf) )
-        printStats()
+    def load_bbfile( self, bbfile ):
+        """Load and parse one .bb build file"""
 
-    ignore = bb.data.getVar("ASSUME_PROVIDED", make.cfg, 1) or ""
-    __ignored_dependencies = ignore.split()
+        if not self.cache in [None, '']:
+            # get the times
+            cache_mtime = data.init_db_mtime(self.cache, bbfile)
+            file_mtime = parse.cached_mtime(bbfile)
 
-    collections = bb.data.getVar("BBFILE_COLLECTIONS", make.cfg, 1)
-    if collections:
-        collection_list = collections.split()
-        for c in collection_list:
-            regex = bb.data.getVar("BBFILE_PATTERN_%s" % c, make.cfg, 1)
-            if regex == None:
-                bb.error("BBFILE_PATTERN_%s not defined" % c)
-                continue
-            priority = bb.data.getVar("BBFILE_PRIORITY_%s" % c, make.cfg, 1)
-            if priority == None:
-                bb.error("BBFILE_PRIORITY_%s not defined" % c)
-                continue
-            try:
-                cre = re.compile(regex)
-            except re.error:
-                bb.error("BBFILE_PATTERN_%s \"%s\" is not a valid regular expression" % (c, regex))
-                continue
+            if file_mtime > cache_mtime:
+                #print " : '%s' dirty. reparsing..." % bbfile
+                pass
+            else:
+                #print " : '%s' clean. loading from cache..." % bbfile
+                cache_data = data.init_db( self.cache, bbfile, False )
+                if self.deps_clean(cache_data):
+                    return cache_data, True
+
+        topdir = data.getVar('TOPDIR', self.configuration.data)
+        if not topdir:
+            topdir = os.path.abspath(os.getcwd())
+            # set topdir to here
+            data.setVar('TOPDIR', topdir, self.configuration)
+        bbfile = os.path.abspath(bbfile)
+        bbfile_loc = os.path.abspath(os.path.dirname(bbfile))
+        # expand tmpdir to include this topdir
+        data.setVar('TMPDIR', data.getVar('TMPDIR', self.configuration.data, 1) or "", self.configuration.data)
+        # set topdir to location of .bb file
+        topdir = bbfile_loc
+        #data.setVar('TOPDIR', topdir, cfg)
+        # go there
+        oldpath = os.path.abspath(os.getcwd())
+        os.chdir(topdir)
+        bb = data.init_db(self.cache,bbfile, True, self.configuration.data)
+        try:
+            parse.handle(bbfile, bb) # read .bb data
+            if not self.cache in [None, '']:
+                bb.commit(parse.cached_mtime(bbfile)) # write cache
+            os.chdir(oldpath)
+            return bb, False
+        finally:
+            os.chdir(oldpath)
+
+    def collect_bbfiles( self, progressCallback ):
+        """Collect all available .bb build files"""
+        self.cb = progressCallback
+        parsed, cached, skipped, masked = 0, 0, 0, 0
+        self.cache   = bb.data.getVar( "CACHE", self.configuration.data, 1 )
+        self.pkgdata = data.pkgdata( not self.cache in [None, ''], self.cache, self.configuration.data )
+
+        if not self.cache in [None, '']:
+            if self.cb is not None:
+                print "NOTE: Using cache in '%s'" % self.cache
             try:
-                pri = int(priority)
-                bbfile_config_priorities.append((cre, pri))
-            except ValueError:
-                bb.error("invalid value for BBFILE_PRIORITY_%s: \"%s\"" % (c, priority))
+                os.stat( self.cache )
+            except OSError:
+                bb.mkdirhier( self.cache )
+        else:
+            if self.cb is not None:
+                print "NOTE: Not using a cache. Set CACHE = <directory> to enable."
+        files = (data.getVar( "BBFILES", self.configuration.data, 1 ) or "").split()
+        data.setVar("BBFILES", " ".join(files), self.configuration.data)
 
-    pkgs_to_build = None
-    if args:
-        if not pkgs_to_build:
-            pkgs_to_build = []
-        pkgs_to_build.extend(args)
-    if not pkgs_to_build:
-            bbpkgs = bb.data.getVar('BBPKGS', make.cfg, 1)
-            if bbpkgs:
-                    pkgs_to_build = bbpkgs.split()
-    if not pkgs_to_build and not make.options.show_versions:
-            print "Nothing to do.  Use 'bitbake world' to build everything, or run 'bitbake --help'"
-            print "for usage information."
-            sys.exit(0)
-
-
-    # Import Psyco if available and not disabled
-    if not make.options.disable_psyco:
+        if not len(files):
+            files = self.get_bbfiles()
+
+        if not len(files):
+            bb.error("no files to build.")
+
+        newfiles = []
+        for f in files:
+            if os.path.isdir(f):
+                dirfiles = self.find_bbfiles(f)
+                if dirfiles:
+                    newfiles += dirfiles
+                    continue
+            newfiles += glob.glob(f) or [ f ]
+
+        bbmask = bb.data.getVar('BBMASK', self.configuration.data, 1) or ""
         try:
-            import psyco
-        except ImportError:
-            if bbdebug == 0:
-                bb.note("Psyco JIT Compiler (http://psyco.sf.net) not available. Install it to increase performance.")
-        else:
-            psyco.bind( make.collect_bbfiles )
-    else:
-        bb.note("You have disabled Psyco. This decreases performance.")
-
-    try:
-        bb.debug(1, "collecting .bb files")
-        make.collect_bbfiles( myProgressCallback )
-        bb.debug(1, "parsing complete")
-        if bbdebug == 0:
-            print
-        if make.options.parse_only:
-            print "Requested parsing .bb files only.  Exiting."
-            sys.exit(0)
-
-        build_depgraph()
-
-        if make.options.show_versions:
-            showVersions()
-            sys.exit(0)
-            
-        if 'world' in pkgs_to_build:
-            pkgs_to_build.remove('world')
-            for t in __world_target:
-                pkgs_to_build.append(t)
-
-        bb.event.fire(bb.event.BuildStarted(buildname, pkgs_to_build, make.cfg))
-
-        for k in pkgs_to_build:
-            failed = False
+            bbmask_compiled = re.compile(bbmask)
+        except sre_constants.error:
+            bb.fatal("BBMASK is not a valid regular expression.")
+
+        for i in xrange( len( newfiles ) ):
+            f = newfiles[i]
+            if bbmask and bbmask_compiled.search(f):
+                bb.debug(1, "bbmake: skipping %s" % f)
+                masked += 1
+                continue
+            debug(1, "bbmake: parsing %s" % f)
+
+            # read a file's metadata
             try:
-                if buildPackage(k) == 0:
-                    # already diagnosed
-                    failed = True
-            except bb.build.EventException:
-                bb.error("Build of " + k + " failed")
-                failed = True
+                bb_data, fromCache = self.load_bbfile(f)
+                if fromCache: cached += 1
+                else: parsed += 1
+                deps = None
+                if bb_data is not None:
+                    # allow metadata files to add items to BBFILES
+                    #data.update_data(self.pkgdata[f])
+                    addbbfiles = data.getVar('BBFILES', bb_data) or None
+                    if addbbfiles:
+                        for aof in addbbfiles.split():
+                            if not files.count(aof):
+                                if not os.path.isabs(aof):
+                                    aof = os.path.join(os.path.dirname(f),aof)
+                                files.append(aof)
+                    for var in bb_data.keys():
+                        if data.getVarFlag(var, "handler", bb_data) and data.getVar(var, bb_data):
+                            event.register(data.getVar(var, bb_data))
+                    self.pkgdata[f] = bb_data
+
+                # now inform the caller
+                if self.cb is not None:
+                    self.cb( i + 1, len( newfiles ), f, bb_data, fromCache )
+
+            except IOError, e:
+                bb.error("opening %s: %s" % (f, e))
+                pass
+            except bb.parse.SkipPackage:
+                skipped += 1
+                pass
+            except KeyboardInterrupt:
+                raise
+            except Exception, e:
+                bb.error("%s while parsing %s" % (e, f))
+
+        if self.cb is not None:
+            print "\rNOTE: Parsing finished. %d cached, %d parsed, %d skipped, %d masked." % ( cached, parsed, skipped, masked ),
+
+#============================================================================#
+# main
+#============================================================================#
 
-            if failed:
-                if make.options.abort:
-                    sys.exit(1)
+if __name__ == "__main__":
+
+    parser = optparse.OptionParser( version = "BitBake Build Tool Core version %s, %%prog version %s" % ( bb.__version__, __version__ ),
+    usage = """%prog [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
+be executed.  BBFILES does support wildcards.
+Default BBFILES are the .bb files in the current directory.""" )
+
+    parser.add_option( "-b", "--buildfile", help = "execute the task against this .bb file, rather than a package from BBFILES.",
+               action = "store", dest = "buildfile", default = None )
+
+    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( "-f", "--force", help = "force run of specified cmd, regardless of stamp status",
+               action = "store_true", dest = "force", default = False )
+
+    parser.add_option( "-i", "--interactive", help = "drop into the interactive mode.",
+               action = "store_true", dest = "interactive", default = False )
+
+    parser.add_option( "-c", "--cmd", help = "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)",
+               action = "store", dest = "cmd", default = "build" )
+
+    parser.add_option( "-r", "--read", help = "read the specified file before bitbake.conf",
+               action = "append", dest = "file", default = [] )
+
+    parser.add_option( "-v", "--verbose", help = "output more chit-chat to the terminal",
+               action = "store_true", dest = "verbose", default = False )
+
+    parser.add_option( "-D", "--debug", help = "Increase the debug level",
+               action = "count", dest="debug", default = 0)
+
+    parser.add_option( "-n", "--dry-run", help = "don't execute, just go through the motions",
+               action = "store_true", dest = "dry_run", default = False )
+
+    parser.add_option( "-p", "--parse-only", help = "quit after parsing the BB files (developers only)",
+               action = "store_true", dest = "parse_only", default = False )
+
+    parser.add_option( "-d", "--disable-psyco", help = "disable using the psyco just-in-time compiler (not recommended)",
+               action = "store_true", dest = "disable_psyco", default = False )
+
+    parser.add_option( "-s", "--show-versions", help = "show current and preferred versions of all packages",
+               action = "store_true", dest = "show_versions", default = False )
 
-        bb.event.fire(bb.event.BuildCompleted(buildname, pkgs_to_build, make.cfg))
+    parser.add_option( "-e", "--environment", help = "show the global or per-package environment (this is what used to be bbread)",
+               action = "store_true", dest = "show_environment", default = False )
 
-        printStats()
+    options, args = parser.parse_args( sys.argv )
 
-    except KeyboardInterrupt:
-        print "\nNOTE: KeyboardInterrupt - Build not completed."
-        sys.exit(1)
+    cooker = BBCooker()
+    cooker.cook( BBConfiguration( options ), args[1:] )