bitbake/bin/bitbake: Add code to handle RDEPENDS
[vuplus_bitbake] / bin / bitbake
index a23a171..36263cb 100755 (executable)
 # 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
-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, debug, event, fatal, cache
 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()
-
-__stats = {}
-
-bbfile_config_priorities = []
-bbfile_priority = {}
 bbdebug = 0
-providers = {}
-
-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.5.0"
+
+#============================================================================#
+# 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.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()
+        self.build_all = {}
+        self.rundeps = {}
+        self.runrecs = {}
+        self.stamp = {}
+
+    def handle_bb_data(self, file_name, bb_cache, cached):
+        """
+        We will fill the dictionaries with the stuff we
+        need for building the tree more fast
+        """
+
+        pn       = bb_cache.getVar('PN', file_name, True)
+        pv       = bb_cache.getVar('PV', file_name, True)
+        pr       = bb_cache.getVar('PR', file_name, True)
+        dp       = int(bb_cache.getVar('DEFAULT_PREFERENCE', file_name, True) or "0")
+        provides  = Set([pn] + (bb_cache.getVar("PROVIDES", file_name, True) or "").split())
+        depends   = (bb_cache.getVar("DEPENDS", file_name, True) or "").split()
+        packages  = (bb_cache.getVar('PACKAGES', file_name, True) or "").split()
+        packages_dynamic = (bb_cache.getVar('PACKAGES_DYNAMIC', file_name, True) or "").split()
+        rprovides = (bb_cache.getVar("RPROVIDES", file_name, 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)
+
+        self.build_all[file_name] = int(bb_cache.getVar('BUILD_ALL_DEPS', file_name, True) or "0")
+        self.stamp[file_name] = bb_cache.getVar('STAMP', file_name, True)
+
+        # 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)
+
+        # 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)
+            rprovides += (bb_cache.getVar("RPROVIDES_%s" % package, file_name, 1) or "").split() 
+
+        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)
+
+        # Build hash of runtime depeneds and rececommends
+
+        def add_dep(deplist, deps):
+            for dep in deps:
+                if not dep in deplist:
+                    deplist[dep] = ""
+
+        if not file_name in self.rundeps:
+            self.rundeps[file_name] = {}
+        if not file_name in self.runrecs:
+            self.runrecs[file_name] = {}
+
+        for package in packages + [pn]:
+            if not package in self.rundeps[file_name]:
+                self.rundeps[file_name][package] = {}
+            if not package in self.runrecs[file_name]:
+                self.runrecs[file_name][package] = {}
+
+            add_dep(self.rundeps[file_name][package], bb.utils.explode_deps(bb_cache.getVar('RDEPENDS', file_name, True) or ""))
+            add_dep(self.runrecs[file_name][package], bb.utils.explode_deps(bb_cache.getVar('RRECOMMENDS', file_name, True) or ""))
+            add_dep(self.rundeps[file_name][package], bb.utils.explode_deps(bb_cache.getVar("RDEPENDS_%s" % package, file_name, True) or ""))
+            add_dep(self.runrecs[file_name][package], bb.utils.explode_deps(bb_cache.getVar("RRECOMMENDS_%s" % package, file_name, True) or ""))
+
+        # Collect files we may need for possible world-dep
+        # calculations
+        if not bb_cache.getVar('BROKEN', file_name, True) and not bb_cache.getVar('EXCLUDE_FROM_WORLD', file_name, 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 )
+
+#============================================================================#
+# 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.cache = None
+        self.bb_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( "-c", "--cmd", help = "Specify task to execute",
-               action = "store", dest = "cmd", default = "build" )
-
-    parser.add_option( "-r", "--read", help = "read the specified file before bitbake.conf",
-               action = "append", dest = "file", default = [] )
+    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( "-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)
+        the_data = self.bb_cache.loadDataFull(fn, self)
 
-    parser.add_option( "-n", "--dry-run", help = "don't execute, just go through the motions",
-               action = "store_true", dest = "dry_run", default = False )
+        # Only follow all (runtime) dependencies if doing a build
+        if not buildAllDeps and self.configuration.cmd is "build":
+            buildAllDeps = self.status.build_all[fn]
 
-    parser.add_option( "-p", "--parse-only", help = "quit after parsing the BB files (developers only)",
-               action = "store_true", dest = "parse_only", 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( "-d", "--disable-psyco", help = "disable using the psyco just-in-time compiler (not recommended)",
-               action = "store_true", dest = "disable_psyco", 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)
 
-    parser.add_option( "-s", "--show-versions", help = "show current and preferred versions of all packages",
-               action = "store_true", dest = "show_versions", default = False )
+        item = self.status.pkg_fn[fn]
 
-    options, args = parser.parse_args( args )
-    return options, args[1:]
+        self.building_list.append(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
+        pathstr = "%s (%s)" % (item, virtual)
+        self.build_path.append(pathstr)
 
-    the_data = make.pkgdata[fn]
-    item = bb.data.getVar('PN', the_data, 1)
+        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
 
-    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)))
+            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
 
-    try:
-        failed = False
+            if depcmd:
+                self.configuration.cmd = oldcmd
 
-        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 failed:
+                self.stats.deps += 1
+                return False
 
-        if depcmd:
-            oldcmd = make.options.cmd
-            make.options.cmd = depcmd
+            if not self.addRunDeps(fn, virtual , buildAllDeps):
+                return False
 
-        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
+            if bb.build.stamp_is_current('do_%s' % self.configuration.cmd, the_data):
+                self.build_cache.append(fn)
+                return True
 
-        if depcmd:
-            make.options.cmd = oldcmd
+            return self.tryBuildPackage( fn, item, the_data )
 
-        if failed:
-            __stats["deps"] += 1
-            return False
+        finally:
+            self.building_list.remove(fn)
+            self.build_path.remove(pathstr)
 
-        if bb.build.stamp_is_current('do_%s' % make.options.cmd, the_data):
-            __build_cache.append(fn)
-            return True
+    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, the_data))
-        try:
-            __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))
-            __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, the_data))
-            __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, the_data))
-            __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:
@@ -232,508 +378,940 @@ 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]
-
-        if pref != latest:
-            prefstr = pref[0][0] + "-" + pref[0][1]
-        else:
-            prefstr = ""
-
-        print "%-30s %20s %20s" % (p, latest[0][0] + "-" + latest[0][1],
-                                   prefstr)
-
-__consider_msgs_cache = []
-def buildPackage(item):
-    fn = None
-
-    discriminated = False
 
-    if not providers.has_key(item):
-        bb.error("Nothing provides %s" % item)
-        return 0
-
-    all_p = providers[item]
+        return (latest,latest_f,preferred_ver, preferred_file)
 
-    for p in all_p:
-        if p in __build_cache:
-            bb.debug(1, "already built %s in this run\n" % p)
-            return 1
+    def showVersions( self ):
+        pkg_pn = self.status.pkg_pn
+        preferred_versions = {}
+        latest_versions = {}
 
-    eligible = []
-    preferred_versions = {}
+        # 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)
 
-    # 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)
+        pkg_list = pkg_pn.keys()
+        pkg_list.sort()
 
-    bb.debug(1, "providers for %s are: %s" % (item, pkg_pn.keys()))
-
-    # 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]
+        for p in pkg_list:
+            pref = preferred_versions[p]
+            latest = latest_versions[p]
 
-    # 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:
-                    break
-            if preferred_r:
-                pv_str = '%s-%s' % (preferred_v, preferred_r)
+            if pref != latest:
+                prefstr = pref[0][0] + "-" + pref[0][1]
             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))
+                prefstr = ""
 
-        preferred_versions[pn] = (preferred_ver, preferred_file)
-        eligible.append(preferred_file)
+            print "%-30s %20s %20s" % (p, latest[0][0] + "-" + latest[0][1],
+                                        prefstr)
 
-    for p in eligible:
-        if p in __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
+    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)
+            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 generateDotGraph( self, pkgs_to_build, ignore_deps ):
+        """
+        Generate two graphs one for the DEPENDS and RDEPENDS. The current
+        implementation creates crappy graphs ;)
+
+        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
+        """
+
+        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)
+
+            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])
+
+            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
+
+            prefervar = bb.data.getVar('PREFERRED_PROVIDER_%s' % package, self.configuration.data, 1)
+
+            # try the preferred provider first
+            if prefervar:
+                for p in elligible:
+                    if prefervar == self.status.pkg_fn[p]:
+                        bb.note("Selecting PREFERRED_PROVIDER %s" % prefervar)
+                        elligible.remove(p)
+                        elligible = [p] + elligible
+
+            return eligible
+
+
+
+
+        # try to avoid adding the same rdepends over an over again
+        seen_depends  = []
+        seen_rdepends = []
+
+
+        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
+
+                seen_depends.append( package )
+                if not package in self.status.providers:
+                    """
+                    We have not seen this name -> error in
+                    dependency handling
+                    """
+                    bb.note( "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 = self.filterProviders(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 see if this is a runtime or
+                if package in the_depends:
+                    if not package in self.status.providers:
+                        bb.note( "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(self.getProvidersRun(package)) == 0:
+                        bb.note( "ERROR with rprovider: %(package)s" % vars() )
+                        print >> alldepends_file, '"%(package)s" -> ERROR [style="dashed"]' % vars()
+                        continue
+
+                    providers = self.getProvidersRun(package)
+                else:
+                    print "Complete ERROR! %s" % package
+                    continue
+
+                # now let us find the bestProvider for it
+                fn = self.filterProviders(providers, package)[0]
+
+                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 package == "task-opie-applets":
+                    print fn
+                    print depends
+                    print depends
+                    print version
+
+                add_all_depends ( depends, rdepends )
+
+                # now create the node
+                print >> alldepends_file, '"%(package)s" [label="%(package)s\\n%(version)s"]' % vars()
+
+                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()
+
+
+        # 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 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])
 
-    # 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):
         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))
+            if p in self.build_cache_fail:
+                bb.debug(1, "rejecting already-failed %s" % p)
                 eligible.remove(p)
-                eligible = [p] + eligible
+
+        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 providers:
+            pn = self.status.pkg_fn[p]
+            pv, pr = self.status.pkg_pvpr[p]
+
+            stamp = '%s.do_populate_staging' % self.status.stamp[p]
+            if os.path.exists(stamp):
+                (newvers, fn) = preferred_versions[pn]
+                if not fn in eligible:
+                    # package was made ineligible by already-failed check
+                    continue
+                oldver = "%s-%s" % (pv, pr)
+                newver = '-'.join(newvers)
+                if (newver != oldver):
+                    extra_chat = "%s (%s) already staged but upgrading to %s to satisfy %s" % (pn, oldver, newver, item)
+                else:
+                    extra_chat = "Selecting already-staged %s (%s) to satisfy %s" % (pn, oldver, item)
+                if self.configuration.verbose:
+                    bb.note("%s" % extra_chat)
+                eligible.remove(fn)
+                eligible = [fn] + eligible
                 discriminated = True
                 break
 
-    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)
+        return eligible
 
+    def buildProvider( self, item , buildAllDeps , build_depends = [] ):
+        """
+        Build something to provide a named build requirement
+        (takes item names from DEPENDS namespace)
+        """
 
-    # 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
+        fn = None
+        discriminated = False
 
-    bb.note("no buildable providers for %s" % item)
-    return 0
+        if not item in self.status.providers:
+            bb.error("Nothing provides dependency %s" % item)
+            bb.event.fire(bb.event.NoProvider(item,self.configuration.data))
+            return 0
 
-def build_depgraph():
-    all_depends = Set()
-    pn_provides = {}
+        all_p = self.status.providers[item]
 
-    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
+        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 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)
+                bb.event.fire(bb.event.MultipleProviders(item,providers_list,self.configuration.data))
+            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 %s" % (fn, item))
+            if self.tryBuild(fn, item, buildAllDeps, build_depends + [fn]):
+                return 1
+
+        bb.note("no buildable providers for %s" % item)
+        bb.event.fire(bb.event.NoProvider(item,self.configuration.data))
         return 0
 
-    # 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 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
 
-    # 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 not buildAllDeps:
+            return True
+
+        all_p = self.getProvidersRun(item)
+
+        if not all_p:
+            bb.error("Nothing provides runtime dependency %s" % (item))
+            bb.event.fire(bb.event.NoProvider(item,self.configuration.data,runtime=True))
+            return False
 
-    op = -1
+        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)
 
-    bb.debug(1, "building providers hashes")
+        eligible = self.filterProviders(all_p, item)
+        if not eligible:
+            return 0
 
-    # Build forward and reverse provider hashes
-    # Forward: virtual -> [filenames]
-    # Reverse: PN -> [virtuals]
-    for f in make.pkgdata.keys():
-        d = make.pkgdata[f]
+        preferred = []
+        for p in eligible:
+            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)
+                bb.event.fire(bb.event.MultipleProviders(item,providers_list,self.configuration.data,runtime=True))
+            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)
+                bb.event.fire(bb.event.MultipleProviders(item,providers_list,self.configuration.data,runtime=True))
+            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)
+        bb.event.fire(bb.event.NoProvider(item,self.configuration.data))
+        return False
 
-        pn = bb.data.getVar('PN', d, 1)
-        provides = Set([pn] + (bb.data.getVar("PROVIDES", d, 1) or "").split())
+    def getProvidersRun(self, rdepend):
+        """
+        Return any potential providers of runtime rdepend
+        """
+        rproviders = []
 
-        if not pn_provides.has_key(pn):
-            pn_provides[pn] = Set()
-        pn_provides[pn] |= provides
+        if rdepend in self.status.rproviders:
+            rproviders += self.status.rproviders[rdepend]
 
-        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))
+        if rdepend in self.status.packages:
+            rproviders += self.status.packages[rdepend]
+
+        if rproviders:
+            return rproviders
+
+        # 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]
+
+        return rproviders
+
+    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.
+        """
+
+        if item in self.rbuild_cache:
+            return True
+
+        if not buildAllDeps:
+            return True
+
+        rdepends = []
+        self.rbuild_cache.append(item)
+
+        if fn in self.status.rundeps and item in self.status.rundeps[fn]:
+            rdepends += self.status.rundeps[fn][item].keys()
+        if fn in self.status.runrecs and item in self.status.runrecs[fn]:
+            rdepends += self.status.runrecs[fn][item].keys()
+
+        bb.debug(2, "Additional runtime dependencies for %s are: %s" % (item, " ".join(rdepends)))
+
+        for rdepend in rdepends:
+            if rdepend in self.status.ignored_dependencies:
+                continue
+            if not self.buildRProvider(rdepend, buildAllDeps):
+                return False
+        return True
+
+    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)
+
+        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', 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
+
+        # Calculate priorities for each file
+        for p in self.status.pkg_fn.keys():
+            self.status.bbfile_priority[p] = calc_bbfile_priority(p)
+
+    def buildWorldTargetList(self):
+        """
+         Build package list for "bitbake world"
+        """
+        all_depends = self.status.all_depends
+        pn_provides = self.status.pn_provides
+        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, bb_cache, from_cache ):
+        # feed the status with new input
+
+        self.status.handle_bb_data(f, bb_cache, 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 )
+
+            # 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" % 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 ):
+        """
+        We are building stuff here. We do the building
+        from here. By default we try to execute task
+        build.
+        """
+
+        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" ) )
+
+
+        #
+        # 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 )
+
+        # 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)
+
+            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 )
+
+            sys.exit( self.stats.show() )
+
+        # initialise the parsing status now we know we will need deps
+        self.status = BBParsingStatus()
+
+        ignore = bb.data.getVar("ASSUME_PROVIDED", self.configuration.data, 1) or ""
+        self.status.ignored_dependencies = Set( ignore.split() )
 
-        if make.options.parse_only:
-            print "Requested parsing .bb files only.  Exiting."
-            sys.exit(0)
+        self.handleCollections( bb.data.getVar("BBFILE_COLLECTIONS", self.configuration.data, 1) )
+
+        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.")
 
-        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)
+            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
+
+
+            self.buildDepgraph()
+
+            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)
+
+            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))
+
+            failures = 0
+            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
 
-#
-# main
-#
+                if failed:
+                    failures += failures
+                    if self.configuration.abort:
+                        sys.exit(1)
 
-__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)
+            bb.event.fire(bb.event.BuildCompleted(buildname, pkgs_to_build, self.configuration.event_data, failures))
 
-if __name__ == "__main__":
+            sys.exit( self.stats.show() )
+
+        except KeyboardInterrupt:
+            print "\nNOTE: 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
 
-    make.options, args = handle_options( sys.argv )
+    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, progressCallback ):
+        """Collect all available .bb build files"""
+        self.cb = progressCallback
+        parsed, cached, skipped, masked = 0, 0, 0, 0
+        self.bb_cache = bb.cache.init(self)
 
-    if not make.options.cmd:
-        make.options.cmd = "build"
+        files = (data.getVar( "BBFILES", self.configuration.data, 1 ) or "").split()
+        data.setVar("BBFILES", " ".join(files), self.configuration.data)
 
-    if make.options.debug:
-        bb.debug_level = make.options.debug
+        if not len(files):
+            files = self.get_bbfiles()
 
-    make.cfg = bb.data.init()
+        if not len(files):
+            bb.error("no files to build.")
 
-    for f in make.options.file:
+        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:
-            make.cfg = bb.parse.handle(f, make.cfg)
-        except IOError:
-            bb.fatal("Unable to open %s" % f)
-
-    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'))
-
-    if not bb.data.getVar("BUILDNAME", make.cfg):
-        bb.data.setVar("BUILDNAME", os.popen('date +%Y%m%d%H%M').readline().strip(), make.cfg)
-
-    buildname = bb.data.getVar("BUILDNAME", make.cfg)
-
-    bf = make.options.buildfile
-    if bf:
-        executeOneBB( os.path.abspath(bf) )
-        printStats()
-
-    ignore = bb.data.getVar("ASSUME_PROVIDED", make.cfg, 1) or ""
-    global __ignored_dependencies
-    __ignored_dependencies = Set( ignore.split() )
-
-    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)
+            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
-            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
-            try:
-                pri = int(priority)
-                bbfile_config_priorities.append((cre, pri))
-            except ValueError:
-                bb.error("invalid value for BBFILE_PRIORITY_%s: \"%s\"" % (c, priority))
+            debug(1, "bbmake: parsing %s" % f)
 
-    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:
-        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
+            # 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
+                fromCache, skip = self.bb_cache.loadData(f, self)
+                if skip:
+                    skipped += 1
+                    #bb.note("Skipping %s" % f)
+                    self.bb_cache.skip(f)
+                    continue
+                elif fromCache: cached += 1
+                else: parsed += 1
+                deps = None
+
+                # 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)
+
+                # now inform the caller
+                if self.cb is not None:
+                    self.cb( i + 1, len( newfiles ), f, self.bb_cache, fromCache )
+
+            except IOError, e:
+                self.bb_cache.remove(f)
+                bb.error("opening %s: %s" % (f, e))
+                pass
+            except KeyboardInterrupt:
+                self.bb_cache.sync()
+                raise
+            except Exception, e:
+                self.bb_cache.remove(f)
+                bb.error("%s while parsing %s" % (e, f))
+            except:
+                self.bb_cache.remove(f)
+                raise
+
+        if self.cb is not None:
+            print "\rNOTE: Parsing finished. %d cached, %d parsed, %d skipped, %d masked." % ( cached, parsed, skipped, masked ),
+
+        self.bb_cache.sync()
+
+#============================================================================#
+# main
+#============================================================================#
 
-            if failed:
-                if make.options.abort:
-                    sys.exit(1)
+def 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 also called the BitBake shell.",
+               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). Depending on the base.bbclass a listtaks tasks is defined and will show available tasks",
+               action = "store", dest = "cmd", default = "build" )
+
+    parser.add_option( "-r", "--read", help = "read the specified file before bitbake.conf",
+               action = "append", dest = "file", default = [] )
 
-        bb.event.fire(bb.event.BuildCompleted(buildname, pkgs_to_build, make.cfg))
+    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. You can specify this more than once.",
+               action = "count", dest="debug", default = 0)
 
-        printStats()
+    parser.add_option( "-n", "--dry-run", help = "don't execute, just go through the motions",
+               action = "store_true", dest = "dry_run", default = False )
 
-    except KeyboardInterrupt:
-        print "\nNOTE: KeyboardInterrupt - Build not completed."
-        sys.exit(1)
+    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 )
+
+    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 = [] )
+
+
+    options, args = parser.parse_args( sys.argv )
+
+    cooker = BBCooker()
+    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.4 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()