runqueue.py: Change failed tasks handling so all failed tasks are reported, not just...
[vuplus_bitbake] / bin / bitbake
index 1fc6fd0..253ee09 100755 (executable)
@@ -7,6 +7,7 @@
 # Copyright (C) 2003 - 2005 Michael 'Mickey' Lauer
 # Copyright (C) 2005        Holger Hans Peter Freyther
 # Copyright (C) 2005        ROAD GmbH
+# Copyright (C) 2006        Richard Purdie
 #
 # 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
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA 02111-1307 USA.
 
-import sys, os, getopt, glob, copy, os.path, re
-sys.path.append(os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])), 'lib'))
+import sys, os, getopt, glob, copy, os.path, re, time
+sys.path.insert(0,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, event, cache, providers, taskdata, runqueue
 from sets import Set
 import itertools, optparse
 
 parsespin = itertools.cycle( r'|/-\\' )
-bbdebug = 0
-
-__version__ = "1.2.9"
-
-#============================================================================#
-# 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.bbfile_priority = {}
-        self.bbfile_config_priorities = []
-        self.ignored_depedencies = 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())
-        depends  = (bb.data.getVar("DEPENDS", 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)
-
-        for dep in depends:
-            self.all_depends.add(dep)
-
-        # 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)
 
+__version__ = "1.7.4"
 
 #============================================================================#
 # BBStatistics
@@ -133,6 +58,17 @@ class BBStatistics:
 
 
 #============================================================================#
+# 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 )
+
+#============================================================================#
 # BBCooker
 #============================================================================#
 class BBCooker:
@@ -140,100 +76,63 @@ 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.building_list = []
-        self.build_path = []
-        self.consider_msgs_cache = []
-        self.preferred = {}
         self.stats = BBStatistics()
         self.status = None
 
-    def tryBuild( self, fn, virtual ):
-        if fn in self.building_list:
-            bb.error("%s depends on itself (eventually)" % fn)
-            bb.error("upwards chain is: %s" % (" -> ".join(self.build_path)))
-            return False
-
-        the_data = make.pkgdata[fn]
-        item = self.status.pkg_fn[fn]
-
-        self.building_list.append(fn)
-
-        pathstr = "%s (%s)" % (item, virtual)
-        self.build_path.append(pathstr)
-
-        depends_list = (bb.data.getVar('DEPENDS', the_data, 1) or "").split()
-        if make.options.verbose:
-            bb.note("current path: %s" % (" -> ".join(self.build_path)))
-            bb.note("dependencies for %s are: %s" % (item, " ".join(depends_list)))
+        self.cache = None
+        self.bb_cache = None
 
+    def tryBuildPackage(self, fn, item, task, the_data, build_depends):
+        """
+        Build one task of a package, optionally build following task depends
+        """
+        bb.event.fire(bb.event.PkgStarted(item, the_data))
         try:
-            failed = False
-
-            depcmd = make.options.cmd
-            bbdepcmd = bb.data.getVarFlag('do_%s' % make.options.cmd, 'bbdepcmd', the_data)
-            if bbdepcmd is not None:
-                if bbdepcmd == "":
-                    depcmd = None
-                else:
-                    depcmd = bbdepcmd
-
-            if depcmd:
-                oldcmd = make.options.cmd
-                make.options.cmd = depcmd
-
-            for d in depends_list:
-                if d in self.status.ignored_dependencies:
-                    continue
-                if not depcmd:
-                    continue
-                if self.buildPackage(d) == 0:
-                    bb.error("dependency %s (for %s) not satisfied" % (d,item))
-                    failed = True
-                    if make.options.abort:
-                        break
+            self.stats.attempt += 1
+            if self.configuration.force:
+                bb.data.setVarFlag('do_%s' % task, 'force', 1, the_data)
+            if not build_depends:
+                bb.data.setVarFlag('do_%s' % task, 'dontrundeps', 1, the_data)
+            if not self.configuration.dry_run:
+                bb.build.exec_task('do_%s' % task, 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.msg.error(bb.msg.domain.Build, "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.msg.error(bb.msg.domain.Build, "%s event exception, aborting" % bb.event.getName(event))
+            bb.event.fire(bb.event.PkgFailed(item, the_data))
+            self.build_cache_fail.append(fn)
+            raise
+
+    def tryBuild( self, fn, 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
+        """
 
-            if depcmd:
-                make.options.cmd = oldcmd
+        the_data = self.bb_cache.loadDataFull(fn, self.configuration.data)
 
-            if failed:
-                self.stats.deps += 1
-                return False
+        item = self.status.pkg_fn[fn]
 
-            if bb.build.stamp_is_current('do_%s' % make.options.cmd, the_data):
-                self.build_cache.append(fn)
-                return True
+        if bb.build.stamp_is_current('do_%s' % self.configuration.cmd, the_data) and not self.configuration.force:
+            self.build_cache.append(fn)
+            return True
 
-            bb.event.fire(bb.event.PkgStarted(item, the_data))
-            try:
-                self.stats.attempt += 1
-                if not make.options.dry_run:
-                    bb.build.exec_task('do_%s' % make.options.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:
-                self.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, the_data))
-                self.build_cache_fail.append(fn)
-                raise
-        finally:
-            self.building_list.remove(fn)
-            self.build_path.remove(pathstr)
+        return self.tryBuildPackage(fn, item, self.configuration.cmd, the_data, build_depends)
 
     def showVersions( self ):
         pkg_pn = self.status.pkg_pn
@@ -242,70 +141,9 @@ class BBCooker:
 
         # Sort by priority
         for pn in pkg_pn.keys():
-            files = pkg_pn[pn]
-            priorities = {}
-            for f in files:
-                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] = []
-            for p in p_list:
-                pkg_pn[pn] = [ priorities[p] ] + pkg_pn[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)
-            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:
-                        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
-                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))
-
-            # get highest priority file set
-            files = pkg_pn[pn][0]
-            latest = None
-            latest_p = 0
-            latest_f = None
-            for f in files:
-                pv,pr = self.status.pkg_pvpr[f]
-                dp = self.status.pkg_dp[f]
-
-                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
-            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)
+            (last_ver,last_file,pref_ver,pref_file) = bb.providers.findBestProvider(pn, self.configuration.data, self.status)
+            preferred_versions[pn] = (pref_ver, pref_file)
+            latest_versions[pn] = (last_ver, last_file)
 
         pkg_list = pkg_pn.keys()
         pkg_list.sort()
@@ -322,178 +160,206 @@ class BBCooker:
             print "%-30s %20s %20s" % (p, latest[0][0] + "-" + latest[0][1],
                                         prefstr)
 
-    def buildPackage( self, item ):
-        fn = None
 
-        discriminated = False
+    def showEnvironment( self ):
+        """Show the outer or per-package environment"""
+        if self.configuration.buildfile:
+            self.cb = None
+            self.bb_cache = bb.cache.init(self)
+            try:
+                self.configuration.data = self.bb_cache.loadDataFull(self.configuration.buildfile, self.configuration.data)
+            except IOError, e:
+                bb.msg.fatal(bb.msg.domain.Parsing, "Unable to read %s: %s" % ( self.configuration.buildfile, e ))
+            except Exception, e:
+                bb.msg.fatal(bb.msg.domain.Parsing, "%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:
+            bb.msg.fatal(bb.msg.domain.Parsing, "%s" % e)
+        # emit the metadata which isnt valid shell
+        data.expandKeys( self.configuration.data )     
+        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 generateDotGraph( self, pkgs_to_build, ignore_deps ):
+        """
+        Generate two graphs one for the DEPENDS and RDEPENDS. The current
+        implementation creates crappy graphs ;)
 
-        if item not in self.status.providers:
-            bb.error("Nothing provides %s" % item)
-            return 0
+        pkgs_to_build A list of packages that needs to be built
+        ignore_deps   A list of names where processing of dependencies
+                      should be stopped. e.g. dependencies that get
+        """
 
-        all_p = self.status.providers[item]
+        def myFilterProvider( providers, item):
+            """
+            Take a list of providers and filter according to environment
+            variables. In contrast to filterProviders we do not discriminate
+            and take PREFERRED_PROVIDER into account.
+            """
+            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)
 
-        for p in all_p:
-            if p in self.build_cache:
-                bb.debug(1, "already built %s in this run\n" % p)
-                return 1
+            bb.msg.debug(1, bb.msg.domain.Provider, "providers for %s are: %s" % (item, pkg_pn.keys()))
 
-        eligible = []
-        preferred_versions = {}
+            for pn in pkg_pn.keys():
+                preferred_versions[pn] = bb.providers.findBestProvider(pn, self.configuration.data, self.status, pkg_pn)[2:4]
+                eligible.append(preferred_versions[pn][1])
 
-        # Collate providers by PN
-        pkg_pn = {}
-        for p in all_p:
-            pn = self.status.pkg_fn[p]
-            if pn not in pkg_pn:
-                pkg_pn[pn] = []
-            pkg_pn[pn].append(p)
+            for p in eligible:
+                if p in self.build_cache_fail:
+                    bb.msg.debug(1, bb.msg.domain.Provider, "rejecting already-failed %s" % p)
+                    eligible.remove(p)
 
-        bb.debug(1, "providers for %s are: %s" % (item, pkg_pn.keys()))
+            if len(eligible) == 0:
+                bb.msg.error(bb.msg.domain.Provider, "no eligible providers for %s" % item)
+                return 0
+
+            prefervar = bb.data.getVar('PREFERRED_PROVIDER_%s' % item, self.configuration.data, 1)
+
+            # try the preferred provider first
+            if prefervar:
+                for p in eligible:
+                    if prefervar == self.status.pkg_fn[p]:
+                        bb.msg.note(1, bb.msg.domain.Provider, "Selecting PREFERRED_PROVIDER %s" % prefervar)
+                        eligible.remove(p)
+                        eligible = [p] + eligible
+
+            return eligible
+
+
+        # try to avoid adding the same rdepends over an over again
+        seen_depends  = []
+        seen_rdepends = []
 
-        # Sort by priority
-        for pn in pkg_pn.keys():
-            files = pkg_pn[pn]
-            priorities = {}
-            for f in files:
-                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] = []
-            for p in p_list:
-                pkg_pn[pn] = [ priorities[p] ] + pkg_pn[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)
-            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:
-                        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
-                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:
-                    pv,pr = self.status.pkg_pvpr[f]
-                    dp    = self.status.pkg_dp[f]
-
-                    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)
-
-        for p in eligible:
-            if p in self.build_cache_fail:
-                bb.debug(1, "rejecting already-failed %s" % p)
-                eligible.remove(p)
-
-        if len(eligible) == 0:
-            bb.error("no eligible 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
+        def add_depends(package_list):
+            """
+            Add all depends of all packages from this list
+            """
+            for package in package_list:
+                if package in seen_depends or package in ignore_deps:
                     continue
-                oldver = "%s-%s" % (pv, pr)
-                newver = '-'.join(newvers)
-                if (newver != oldver):
-                    extra_chat = "; upgrading from %s to %s" % (oldver, newver)
+
+                seen_depends.append( package )
+                if not package in self.status.providers:
+                    """
+                    We have not seen this name -> error in
+                    dependency handling
+                    """
+                    bb.msg.note(1, bb.msg.domain.Depends, "ERROR with provider: %(package)s" % vars() )
+                    print >> depends_file, '"%(package)s" -> ERROR' % vars()
+                    continue
+
+                # get all providers for this package
+                providers = self.status.providers[package]
+
+                # now let us find the bestProvider for it
+                fn = myFilterProvider(providers, package)[0]
+
+                depends  = bb.utils.explode_deps(self.bb_cache.getVar('DEPENDS', fn, True) or "")
+                version  = self.bb_cache.getVar('PV', fn, True ) + '-' + self.bb_cache.getVar('PR', fn, True)
+                add_depends ( depends )
+
+                # now create the node
+                print >> depends_file, '"%(package)s" [label="%(package)s\\n%(version)s"]' % vars()
+
+                depends = filter( (lambda x: x not in ignore_deps), depends )
+                for depend in depends:
+                    print >> depends_file, '"%(package)s" -> "%(depend)s"' % vars()
+
+
+        def add_all_depends( the_depends, the_rdepends ):
+            """
+            Add both DEPENDS and RDEPENDS. RDEPENDS will get dashed
+            lines
+            """
+            package_list = the_depends + the_rdepends
+            for package in package_list:
+                if package in seen_rdepends or package in ignore_deps:
+                    continue
+
+                seen_rdepends.append( package )
+
+                # Let us find out if the package is a DEPENDS or RDEPENDS
+                # and we will set 'providers' with the avilable providers
+                # for the package.
+                if package in the_depends:
+                    if not package in self.status.providers:
+                        bb.msg.note(1, bb.msg.domain.Depends, "ERROR with provider: %(package)s" % vars() )
+                        print >> alldepends_file, '"%(package)s" -> ERROR' % vars()
+                        continue
+
+                    providers = self.status.providers[package]
+                elif package in the_rdepends:
+                    if len(bb.providers.getRuntimeProviders(self.status, package)) == 0:
+                        bb.msg.note(1, bb.msg.domain.Depends, "ERROR with rprovider: %(package)s" % vars() )
+                        print >> alldepends_file, '"%(package)s" -> ERROR [style="dashed"]' % vars()
+                        continue
+
+                    providers = bb.providers.getRuntimeProviders(self.status, package)
                 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:
-            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 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
+                    # something went wrong...
+                    print "Complete ERROR! %s" % package
+                    continue
+
+                # now let us find the bestProvider for it
+                fn = myFilterProvider(providers, package)[0]
+
+                # Now we have a filename let us get the depends and RDEPENDS of it
+                depends  = bb.utils.explode_deps(self.bb_cache.getVar('DEPENDS', fn, True) or "")
+                if fn in self.status.rundeps and package in self.status.rundeps[fn]:
+                    rdepends= self.status.rundeps[fn][package].keys()
+                else:
+                    rdepends = []
+                version  = self.bb_cache.getVar('PV', fn, True ) + '-' + self.bb_cache.getVar('PR', fn, True)
 
-        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)
+                # handle all the depends and rdepends of package
+                add_all_depends ( depends, rdepends )
 
+                # now create the node using package name
+                print >> alldepends_file, '"%(package)s" [label="%(package)s\\n%(version)s"]' % vars()
 
-        # 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):
-                return 1
+                # remove the stuff we want to ignore and add the edges
+                depends = filter( (lambda x: x not in ignore_deps), depends )
+                rdepends = filter( (lambda x: x not in ignore_deps), rdepends )
+                for depend in depends:
+                    print >> alldepends_file, '"%(package)s" -> "%(depend)s"' % vars()
+                for depend in rdepends:
+                    print >> alldepends_file, '"%(package)s" -> "%(depend)s" [style=dashed]' % vars()
 
-        bb.note("no buildable providers for %s" % item)
-        return 0
+
+        # Add depends now
+        depends_file = file('depends.dot', 'w' )
+        print >> depends_file, "digraph depends {"
+        add_depends( pkgs_to_build )
+        print >> depends_file,  "}"
+
+        # Add all depends now
+        alldepends_file = file('alldepends.dot', 'w' )
+        print >> alldepends_file, "digraph alldepends {"
+        add_all_depends( pkgs_to_build, [] )
+        print >> alldepends_file, "}"
 
     def buildDepgraph( self ):
         all_depends = self.status.all_depends
         pn_provides = self.status.pn_provides
 
+        localdata = data.createCopy(self.configuration.data)
+        bb.data.update_data(localdata)
+        bb.data.expandKeys(localdata)
+
         def calc_bbfile_priority(filename):
             for (regex, pri) in self.status.bbfile_config_priorities:
                 if regex.match(filename):
@@ -501,30 +367,35 @@ class BBCooker:
             return 0
 
         # Handle PREFERRED_PROVIDERS
-        for p in (bb.data.getVar('PREFERRED_PROVIDERS', make.cfg, 1) or "").split():
+        for p in (bb.data.getVar('PREFERRED_PROVIDERS', localdata, 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
+            if providee in self.status.preferred and self.status.preferred[providee] != provider:
+                bb.msg.error(bb.msg.domain.Provider, "conflicting preferences for %s: both %s and %s specified" % (providee, provider, self.status.preferred[providee]))
+            self.status.preferred[providee] = provider
 
         # Calculate priorities for each file
-        for p in make.pkgdata.keys():
+        for p in self.status.pkg_fn.keys():
             self.status.bbfile_priority[p] = calc_bbfile_priority(p)
 
-        # Build package list for "bitbake world"
-        bb.debug(1, "collating packages for \"world\"")
+    def buildWorldTargetList(self):
+        """
+         Build package list for "bitbake world"
+        """
+        all_depends = self.status.all_depends
+        pn_provides = self.status.pn_provides
+        bb.msg.debug(1, bb.msg.domain.Parsing, "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))
+                    bb.msg.debug(2, bb.msg.domain.Parsing, "World build skipping %s due to %s provider starting with virtual/" % (f, p))
                     terminal = False
                     break
                 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))
+                        bb.msg.debug(2, bb.msg.domain.Parsing, "World build skipping %s due to both us and %s providing %s" % (f, pf, p))
                         terminal = False
                         break
             if terminal:
@@ -534,12 +405,8 @@ class BBCooker:
             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
+    def myProgressCallback( self, x, y, f, from_cache ):
+        """Update any tty with the progress change"""
         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()
@@ -551,116 +418,156 @@ class BBCooker:
                 sys.stdout.write("done.")
                 sys.stdout.flush()
 
-    def executeOneBB( self, fn ):
-            try:
-                d = bb.parse.handle(fn, make.cfg)
-            except IOError:
-                bb.fatal("Unable to open %s" % fn)
-
-            if make.options.parse_only:
-                print "Requested parsing .bb files only.  Exiting."
-                sys.exit(0)
-
-            name = bb.data.getVar('PN', d, 1)
-            bb.event.fire(bb.event.PkgStarted(name, d))
-            try:
-                self.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))
-                self.build_cache.append(fn)
-            except bb.build.FuncFailed:
-                self.stats.fail += 1
-                bb.error("task stack execution failed")
-                bb.event.fire(bb.event.PkgFailed(name, d))
-                self.build_cache_fail.append(fn)
-            except bb.build.EventException:
-                self.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))
-                self.build_cache_fail.append(fn)
-
     def interactiveMode( self ):
         """Drop off into a shell"""
         try:
             from bb import shell
         except ImportError, details:
-            bb.fatal("Sorry, shell not available (%s)" % details )
+            bb.msg.fatal(bb.msg.domain.Parsing, "Sorry, shell not available (%s)" % details )
         else:
+            bb.data.update_data( self.configuration.data )
+            bb.data.expandKeys(localdata)
             shell.start( self )
             sys.exit( 0 )
 
     def parseConfigurationFile( self, afile ):
         try:
-            make.cfg = bb.parse.handle( afile, make.cfg )
+            self.configuration.data = bb.parse.handle( afile, self.configuration.data )
+
+            # Add the handlers we inherited by INHERIT
+            # we need to do this manually as it is not guranteed
+            # we will pick up these classes... as we only INHERIT
+            # on .inc and .bb files but not on .conf
+            data = bb.data.createCopy( self.configuration.data )
+            inherits  = ["base"] + (bb.data.getVar('INHERIT', data, True ) or "").split()
+            for inherit in inherits:
+                data = bb.parse.handle( os.path.join('classes', '%s.bbclass' % inherit ), data, True )
+
+            # FIXME: This assumes that we included at least one .inc file
+            for var in bb.data.keys(data):
+                if bb.data.getVarFlag(var, 'handler', data):
+                    bb.event.register(var,bb.data.getVar(var, data))
+
         except IOError:
-            bb.fatal( "Unable to open %s" % afile )
+            bb.msg.fatal(bb.msg.domain.Parsing, "Unable to open %s" % afile )
+        except bb.parse.ParseError, details:
+            bb.msg.fatal(bb.msg.domain.Parsing, "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, make.cfg, 1)
+                regex = bb.data.getVar("BBFILE_PATTERN_%s" % c, self.configuration.data, 1)
                 if regex == None:
-                    bb.error("BBFILE_PATTERN_%s not defined" % c)
+                    bb.msg.error(bb.msg.domain.Parsing, "BBFILE_PATTERN_%s not defined" % c)
                     continue
-                priority = bb.data.getVar("BBFILE_PRIORITY_%s" % c, make.cfg, 1)
+                priority = bb.data.getVar("BBFILE_PRIORITY_%s" % c, self.configuration.data, 1)
                 if priority == None:
-                    bb.error("BBFILE_PRIORITY_%s not defined" % c)
+                    bb.msg.error(bb.msg.domain.Parsing, "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))
+                    bb.msg.error(bb.msg.domain.Parsing, "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))
+                    bb.msg.error(bb.msg.domain.Parsing, "invalid value for BBFILE_PRIORITY_%s: \"%s\"" % (c, priority))
 
 
-    def cook( self, args ):
-        if not make.options.cmd:
-            make.options.cmd = "build"
+    def cook( self, configuration, args ):
+        """
+        We are building stuff here. We do the building
+        from here. By default we try to execute task
+        build.
+        """
 
-        if make.options.debug:
-            bb.debug_level = make.options.debug
+        self.configuration = configuration
 
-        make.cfg = bb.data.init()
+        if self.configuration.verbose:
+            bb.msg.set_verbose(True)
+
+        if self.configuration.debug:
+            bb.msg.set_debug_level(self.configuration.debug)
+        else:
+            bb.msg.set_debug_level(0)
 
-        for f in make.options.file:
+        if self.configuration.debug_domains:
+            bb.msg.set_debug_domains(self.configuration.debug_domains)
+
+        self.configuration.data = bb.data.init()
+
+        for f in self.configuration.file:
             self.parseConfigurationFile( f )
 
         self.parseConfigurationFile( os.path.join( "conf", "bitbake.conf" ) )
-        
-        bb.data.update_data( make.cfg )
 
-        if not bb.data.getVar("BUILDNAME", make.cfg):
-            bb.data.setVar("BUILDNAME", os.popen('date +%Y%m%d%H%M').readline().strip(), make.cfg)
+        if not self.configuration.cmd:
+            self.configuration.cmd = bb.data.getVar("BB_DEFAULT_TASK", self.configuration.data)
+
+        # For backwards compatibility - REMOVE ME
+        if not self.configuration.cmd:
+            self.configuration.cmd = "build"
 
-        buildname = bb.data.getVar("BUILDNAME", make.cfg)
+        #
+        # Special updated configuration we use for firing events
+        #
+        self.configuration.event_data = bb.data.createCopy(self.configuration.data)
+        bb.data.update_data(self.configuration.event_data)
+
+        if self.configuration.show_environment:
+            self.showEnvironment()
+            sys.exit( 0 )
 
-        if make.options.interactive:
+        # 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()
 
-        bf = make.options.buildfile
-        if bf:
-            self.executeOneBB( os.path.abspath(bf) )
+        if self.configuration.buildfile is not None:
+            bf = os.path.abspath( self.configuration.buildfile )
+            try:
+                os.stat(bf)
+            except OSError:
+                (filelist, masked) = self.collect_bbfiles()
+                regexp = re.compile(self.configuration.buildfile)
+                matches = []
+                for f in filelist:
+                    if regexp.search(f) and os.path.isfile(f):
+                        bf = f
+                        matches.append(f)
+                if len(matches) != 1:
+                    bb.msg.error(bb.msg.domain.Parsing, "Unable to match %s (%s matches found):" % (self.configuration.buildfile, len(matches)))
+                    for f in matches:
+                        bb.msg.error(bb.msg.domain.Parsing, "    %s" % f)
+                    sys.exit(1)
+                bf = matches[0]                    
+
+            bbfile_data = bb.parse.handle(bf, self.configuration.data)
+
+            item = bb.data.getVar('PN', bbfile_data, 1)
+            try:
+                self.tryBuildPackage(bf, item, self.configuration.cmd, bbfile_data, True)
+            except bb.build.EventException:
+                bb.msg.error(bb.msg.domain.Build,  "Build of '%s' failed" % item )
+
             sys.exit( self.stats.show() )
 
         # initialise the parsing status now we know we will need deps
-        self.status = BBParsingStatus()
+        self.status = bb.cache.CacheData()
 
-        ignore = bb.data.getVar("ASSUME_PROVIDED", make.cfg, 1) or ""
+        ignore = bb.data.getVar("ASSUME_PROVIDED", self.configuration.data, 1) or ""
         self.status.ignored_dependencies = Set( ignore.split() )
 
-        self.handleCollections( bb.data.getVar("BBFILE_COLLECTIONS", make.cfg, 1) )
+        self.handleCollections( bb.data.getVar("BBFILE_COLLECTIONS", self.configuration.data, 1) )
 
         pkgs_to_build = None
         if args:
@@ -668,76 +575,210 @@ class BBCooker:
                 pkgs_to_build = []
             pkgs_to_build.extend(args)
         if not pkgs_to_build:
-                bbpkgs = bb.data.getVar('BBPKGS', make.cfg, 1)
+                bbpkgs = bb.data.getVar('BBPKGS', self.configuration.data, 1)
                 if bbpkgs:
                         pkgs_to_build = bbpkgs.split()
-        if not pkgs_to_build and not make.options.show_versions and not make.options.interactive:
+        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 make.options.disable_psyco:
+        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.")
+                bb.msg.note(1, bb.msg.domain.Collection, "Psyco JIT Compiler (http://psyco.sf.net) not available. Install it to increase performance.")
             else:
-                psyco.bind( make.collect_bbfiles )
+                psyco.bind( self.parse_bbfiles )
         else:
-            bb.note("You have disabled Psyco. This decreases performance.")
+            bb.msg.note(1, bb.msg.domain.Collection, "You have disabled Psyco. This decreases performance.")
 
         try:
-            bb.debug(1, "collecting .bb files")
-            make.collect_bbfiles( self.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)
+            bb.msg.debug(1, bb.msg.domain.Collection, "collecting .bb files")
+            (filelist, masked) = self.collect_bbfiles()
+            self.parse_bbfiles(filelist, masked, self.myProgressCallback)
+            bb.msg.debug(1, bb.msg.domain.Collection, "parsing complete")
+            print
+            if self.configuration.parse_only:
+                bb.msg.note(1, bb.msg.domain.Collection, "Requested parsing .bb files only.  Exiting.")
+                return
+
 
             self.buildDepgraph()
 
-            if make.options.show_versions:
+            if self.configuration.show_versions:
                 self.showVersions()
                 sys.exit( 0 )
             if 'world' in pkgs_to_build:
+                self.buildWorldTargetList()
                 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, make.cfg))
+            if self.configuration.dot_graph:
+                self.generateDotGraph( pkgs_to_build, self.configuration.ignored_dot_deps )
+                sys.exit( 0 )
+
+            bb.event.fire(bb.event.BuildStarted(buildname, pkgs_to_build, self.configuration.event_data))
 
-            for k in pkgs_to_build:
-                failed = False
-                try:
-                    if self.buildPackage(k) == 0:
-                        # already diagnosed
-                        failed = True
-                except bb.build.EventException:
-                    bb.error("Build of " + k + " failed")
-                    failed = True
+            localdata = data.createCopy(self.configuration.data)
+            bb.data.update_data(localdata)
+            bb.data.expandKeys(localdata)
 
-                if failed:
-                    if make.options.abort:
-                        sys.exit(1)
+            taskdata = bb.taskdata.TaskData(self.configuration.abort)
 
-            bb.event.fire(bb.event.BuildCompleted(buildname, pkgs_to_build, make.cfg))
+            runlist = []
+            try:
+                for k in pkgs_to_build:
+                    taskdata.add_provider(localdata, self.status, k)
+                    runlist.append([k, "do_%s" % self.configuration.cmd])
+                taskdata.add_unresolved(localdata, self.status)
+            except bb.providers.NoProvider:
+                sys.exit(1)
+
+            rq = bb.runqueue.RunQueue()
+            rq.prepare_runqueue(self.configuration.data, self.status, taskdata, runlist)
+            try:
+                failures = rq.execute_runqueue(self, self.configuration.data, self.status, taskdata, runlist)
+            except runqueue.TaskFailure, fnids:
+                for fnid in fnids:
+                    bb.msg.error(bb.msg.domain.Build, "'%s' failed" % taskdata.fn_index[fnid])
+                sys.exit(1)
+            bb.event.fire(bb.event.BuildCompleted(buildname, pkgs_to_build, self.configuration.event_data, failures))
 
             sys.exit( self.stats.show() )
 
         except KeyboardInterrupt:
-            print "\nNOTE: KeyboardInterrupt - Build not completed."
+            bb.msg.note(1, bb.msg.domain.Collection, "KeyboardInterrupt - Build not completed.")
             sys.exit(1)
 
+    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
+
+    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 collect_bbfiles( self ):
+        """Collect all available .bb build files"""
+        parsed, cached, skipped, masked = 0, 0, 0, 0
+        self.bb_cache = bb.cache.init(self)
+
+        files = (data.getVar( "BBFILES", self.configuration.data, 1 ) or "").split()
+        data.setVar("BBFILES", " ".join(files), self.configuration.data)
+
+        if not len(files):
+            files = self.get_bbfiles()
+
+        if not len(files):
+            bb.msg.error(bb.msg.domain.Collection, "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)
+
+        if not bbmask:
+            return (newfiles, 0)
+
+        try:
+            bbmask_compiled = re.compile(bbmask)
+        except sre_constants.error:
+            bb.msg.fatal(bb.msg.domain.Collection, "BBMASK is not a valid regular expression.")
+
+        finalfiles = []
+        for i in xrange( len( newfiles ) ):
+            f = newfiles[i]
+            if bbmask and bbmask_compiled.search(f):
+                bb.msg.debug(1, bb.msg.domain.Collection, "skipping masked file %s" % f)
+                masked += 1
+                continue
+            finalfiles.append(f)
+
+        return (finalfiles, masked)
+
+    def parse_bbfiles(self, filelist, masked, progressCallback = None):
+        parsed, cached, skipped = 0, 0, 0
+        for i in xrange( len( filelist ) ):
+            f = filelist[i]
+
+            bb.msg.debug(1, bb.msg.domain.Collection, "parsing %s" % f)
+
+            # read a file's metadata
+            try:
+                fromCache, skip = self.bb_cache.loadData(f, self.configuration.data)
+                if skip:
+                    skipped += 1
+                    bb.msg.debug(2, bb.msg.domain.Collection, "skipping %s" % f)
+                    self.bb_cache.skip(f)
+                    continue
+                elif fromCache: cached += 1
+                else: parsed += 1
+                deps = None
+
+                # Disabled by RP as was no longer functional
+                # allow metadata files to add items to BBFILES
+                #data.update_data(self.pkgdata[f])
+                #addbbfiles = self.bb_cache.getVar('BBFILES', f, False) 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)
+
+                self.bb_cache.handle_data(f, self.status)
+
+                # now inform the caller
+                if progressCallback is not None:
+                    progressCallback( i + 1, len( filelist ), f, fromCache )
+
+            except IOError, e:
+                self.bb_cache.remove(f)
+                bb.msg.error(bb.msg.domain.Collection, "opening %s: %s" % (f, e))
+                pass
+            except KeyboardInterrupt:
+                self.bb_cache.sync()
+                raise
+            except Exception, e:
+                self.bb_cache.remove(f)
+                bb.msg.error(bb.msg.domain.Collection, "%s while parsing %s" % (e, f))
+            except:
+                self.bb_cache.remove(f)
+                raise
+
+        if progressCallback is not None:
+            print "\r" # need newline after Handling Bitbake files message
+            bb.msg.note(1, bb.msg.domain.Collection, "Parsing finished. %d cached, %d parsed, %d skipped, %d masked." % ( cached, parsed, skipped, masked ))
+
+        self.bb_cache.sync()
+
 #============================================================================#
 # main
 #============================================================================#
 
-if __name__ == "__main__":
-
+def main():
     parser = optparse.OptionParser( version = "BitBake Build Tool Core version %s, %%prog version %s" % ( bb.__version__, __version__ ),
     usage = """%prog [options] [package ...]
 
@@ -755,11 +796,11 @@ Default BBFILES are the .bb files in the current directory.""" )
     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.",
+    parser.add_option( "-i", "--interactive", help = "drop into the interactive mode also called the BitBake shell.",
                action = "store_true", dest = "interactive", default = False )
 
-    parser.add_option( "-c", "--cmd", help = "Specify task to execute",
-               action = "store", dest = "cmd", default = "build" )
+    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). Depending on the base.bbclass a listtaks tasks is defined and will show available tasks",
+               action = "store", dest = "cmd" )
 
     parser.add_option( "-r", "--read", help = "read the specified file before bitbake.conf",
                action = "append", dest = "file", default = [] )
@@ -767,7 +808,7 @@ Default BBFILES are the .bb files in the current directory.""" )
     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",
+    parser.add_option( "-D", "--debug", help = "Increase the debug level. You can specify this more than once.",
                action = "count", dest="debug", default = 0)
 
     parser.add_option( "-n", "--dry-run", help = "don't execute, just go through the motions",
@@ -782,8 +823,30 @@ Default BBFILES are the .bb files in the current directory.""" )
     parser.add_option( "-s", "--show-versions", help = "show current and preferred versions of all packages",
                action = "store_true", dest = "show_versions", default = False )
 
+    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 )
+
+    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( "-l", "--log-domains", help = """Show debug logging for the specified logging domains""",
+                action = "append", dest = "debug_domains", default = [] )
+
+
     options, args = parser.parse_args( sys.argv )
 
-    make.options = options
     cooker = BBCooker()
-    cooker.cook( args[1:] )
+    cooker.cook( BBConfiguration( options ), args[1:] )
+
+
+
+if __name__ == "__main__":
+    print """WARNING, WARNING, WARNING
+This is a Bitbake from the Unstable/Development Branch.
+You might want to use the bitbake-1.6 stable branch (if you are not a BitBake developer or tester). I'm going to sleep 5 seconds now to make sure you see that."""
+    import time
+    time.sleep(5)
+    main()