bin/bitbake:
[vuplus_bitbake] / bin / bitbake
index 34b7475..ac5a8b7 100755 (executable)
 # 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, debug, event, fatal
 from sets import Set
 import itertools, optparse
 
 parsespin = itertools.cycle( r'|/-\\' )
 bbdebug = 0
 
-__version__ = "1.3.1"
+__version__ = "1.3.3.2"
 
 #============================================================================#
 # BBParsingStatus
@@ -46,9 +46,12 @@ class BBParsingStatus:
     def __init__(self):
         self.cache_dirty = False
         self.providers   = {}
+        self.rproviders = {}
+        self.packages = {}
+        self.packages_dynamic = {}
         self.bbfile_priority = {}
         self.bbfile_config_priorities = []
-        self.ignored_depedencies = None
+        self.ignored_dependencies = None
         self.possible_world = []
         self.world_target = Set()
         self.pkg_pn = {}
@@ -75,6 +78,9 @@ class BBParsingStatus:
         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()
+        packages = (bb.data.getVar('PACKAGES', bb_data, True) or "").split()
+        packages_dynamic = (bb.data.getVar('PACKAGES_DYNAMIC', bb_data, True) or "").split()
+        rprovides = (bb.data.getVar("RPROVIDES", bb_data, 1) or "").split()
 
 
         # build PackageName to FileName lookup table
@@ -102,6 +108,24 @@ class BBParsingStatus:
         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.data.getVar("RPROVIDES_%s" % package, bb_data, 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)
+
         # 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):
@@ -133,6 +157,18 @@ 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 )
+        self.data = data.init()
+
+#============================================================================#
 # BBCooker
 #============================================================================#
 class BBCooker:
@@ -146,6 +182,7 @@ class BBCooker:
     def __init__( self ):
         self.build_cache_fail = []
         self.build_cache = []
+        self.rbuild_cache = []
         self.building_list = []
         self.build_path = []
         self.consider_msgs_cache = []
@@ -153,15 +190,18 @@ class BBCooker:
         self.stats = BBStatistics()
         self.status = None
 
+        self.pkgdata = None
+        self.cache = None
+
     def tryBuildPackage( self, fn, item, the_data ):
         """Build one package"""
         bb.event.fire(bb.event.PkgStarted(item, the_data))
         try:
             self.stats.attempt += 1
-            if make.options.force:
-                bb.data.setVarFlag('do_%s' % make.options.cmd, 'force', 1, the_data)
-            if not make.options.dry_run:
-                bb.build.exec_task('do_%s' % make.options.cmd, the_data)
+            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
@@ -179,14 +219,29 @@ class BBCooker:
             self.build_cache_fail.append(fn)
             raise
 
-    def tryBuild( self, fn, virtual ):
-        """Build a provider and its dependencies"""
-        if fn in self.building_list:
+    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
+        """
+
+        the_data = self.pkgdata[fn]
+
+        if not buildAllDeps:
+            buildAllDeps = bb.data.getVar('BUILD_ALL_DEPS', the_data, True) or 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
 
-        the_data = make.pkgdata[fn]
+        # 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)
+
         item = self.status.pkg_fn[fn]
 
         self.building_list.append(fn)
@@ -194,16 +249,17 @@ class BBCooker:
         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:
+        depends_list = (bb.data.getVar('DEPENDS', the_data, True) or "").split()
+
+        if self.configuration.verbose:
             bb.note("current path: %s" % (" -> ".join(self.build_path)))
             bb.note("dependencies for %s are: %s" % (item, " ".join(depends_list)))
 
         try:
             failed = False
 
-            depcmd = make.options.cmd
-            bbdepcmd = bb.data.getVarFlag('do_%s' % make.options.cmd, 'bbdepcmd', the_data)
+            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
@@ -211,28 +267,31 @@ class BBCooker:
                     depcmd = bbdepcmd
 
             if depcmd:
-                oldcmd = make.options.cmd
-                make.options.cmd = 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 ) == 0:
+                if self.buildProvider( dependency , buildAllDeps , build_depends ) == 0:
                     bb.error("dependency %s (for %s) not satisfied" % (dependency,item))
                     failed = True
-                    if make.options.abort:
+                    if self.configuration.abort:
                         break
 
             if depcmd:
-                make.options.cmd = oldcmd
+                self.configuration.cmd = oldcmd
 
             if failed:
                 self.stats.deps += 1
                 return False
 
-            if bb.build.stamp_is_current('do_%s' % make.options.cmd, the_data):
+            if not self.addRunDeps(fn, virtual , buildAllDeps):
+                return False
+
+            if bb.build.stamp_is_current('do_%s' % self.configuration.cmd, the_data):
                 self.build_cache.append(fn)
                 return True
 
@@ -242,13 +301,14 @@ class BBCooker:
             self.building_list.remove(fn)
             self.build_path.remove(pathstr)
 
-    def findBestProvider( self, pn ):
+    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.
         """
-        pkg_pn = self.status.pkg_pn
+        if not pkg_pn:
+            pkg_pn = self.status.pkg_pn
 
         files = pkg_pn[pn]
         priorities = {}
@@ -261,12 +321,15 @@ class BBCooker:
         p_list.sort(lambda a, b: a - b)
         tmp_pn = []
         for p in p_list:
-            tmp_pn = priorities[p] + tmp_pn
-        pkg_pn[pn] = tmp_pn
+            tmp_pn = [priorities[p]] + tmp_pn
 
         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:
             m = re.match('(.*)_(.*)', preferred_v)
             if m:
@@ -275,12 +338,15 @@ class BBCooker:
             else:
                 preferred_r = None
 
-            for f in pkg_pn[pn]:
-                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
+            for file_set in tmp_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:
@@ -290,8 +356,10 @@ class BBCooker:
             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]
+        files = tmp_pn[0]
         latest = None
         latest_p = 0
         latest_f = None
@@ -299,7 +367,7 @@ class BBCooker:
             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 = file_name
                 latest_p = dp
@@ -335,28 +403,37 @@ class BBCooker:
             print "%-30s %20s %20s" % (p, latest[0][0] + "-" + latest[0][1],
                                         prefstr)
 
-    def buildProvider( self, item ):
-        fn = None
-
-        discriminated = False
-
-        if item not in self.status.providers:
-            bb.error("Nothing provides %s" % item)
-            return 0
-
-        all_p = self.status.providers[item]
-
-        for p in all_p:
-            if p in self.build_cache:
-                bb.debug(1, "already built %s in this run\n" % p)
-                return 1
-
+    def showEnvironment( self ):
+        """Show the outer or per-package environment"""
+        if self.configuration.buildfile:
+            try:
+                self.configuration.data, fromCache = self.load_bbfile( self.configuration.buildfile )
+            except IOError, e:
+                fatal("Unable to read %s: %s" % ( self.configuration.buildfile, e ))
+            except Exception, e:
+                fatal("%s" % e)
+        # emit variables and shell functions
+        try:
+            data.update_data( self.configuration.data )
+            data.emit_env(sys.__stdout__, self.configuration.data, True)
+        except Exception, e:
+            fatal("%s" % e)
+        # emit the metadata which isnt valid shell
+        for e in self.configuration.data.keys():
+            if data.getVarFlag( e, 'python', self.configuration.data ):
+                sys.__stdout__.write("\npython %s () {\n%s}\n" % (e, data.getVar(e, self.configuration.data, 1)))
+
+    def filterProviders(self, providers, item):
+        """
+        Take a list of providers and filter/reorder according to the 
+        environment variables and previous build results
+        """
         eligible = []
         preferred_versions = {}
 
         # Collate providers by PN
         pkg_pn = {}
-        for p in all_p:
+        for p in providers:
             pn = self.status.pkg_fn[p]
             if pn not in pkg_pn:
                 pkg_pn[pn] = []
@@ -365,7 +442,7 @@ class BBCooker:
         bb.debug(1, "providers for %s are: %s" % (item, pkg_pn.keys()))
 
         for pn in pkg_pn.keys():
-            preferred_versions[pn] = self.findBestProvider(pn)[2:4]
+            preferred_versions[pn] = self.findBestProvider(pn, pkg_pn)[2:4]
             eligible.append(preferred_versions[pn][1])
 
         for p in eligible:
@@ -379,13 +456,12 @@ class BBCooker:
 
         # 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]
+        for p in providers:
+            the_data = self.pkgdata[p]
             pn = bb.data.getVar('PN', the_data, 1)
             pv = bb.data.getVar('PV', the_data, 1)
             pr = bb.data.getVar('PR', the_data, 1)
-            tmpdir = bb.data.getVar('TMPDIR', the_data, 1)
-            stamp = '%s/stamps/%s-%s-%s.do_populate_staging' % (tmpdir, pn, pv, pr)
+            stamp = '%s.do_populate_staging' % bb.data.getVar('STAMP', the_data, 1)
             if os.path.exists(stamp):
                 (newvers, fn) = preferred_versions[pn]
                 if not fn in eligible:
@@ -397,14 +473,42 @@ class BBCooker:
                     extra_chat = "; upgrading from %s to %s" % (oldver, newver)
                 else:
                     extra_chat = ""
-                if make.options.verbose:
+                if self.configuration.verbose:
                     bb.note("selecting already-staged %s to satisfy %s%s" % (pn, item, extra_chat))
                 eligible.remove(fn)
                 eligible = [fn] + eligible
                 discriminated = True
                 break
 
-        prefervar = bb.data.getVar('PREFERRED_PROVIDER_%s' % item, make.cfg, 1)
+        return eligible
+
+    def buildProvider( self, item , buildAllDeps , build_depends = [] ):
+        """
+        Build something to provide a named build requirement
+        (takes item names from DEPENDS namespace)
+        """
+
+        fn = None
+        discriminated = False
+
+        if not item in self.status.providers:
+            bb.error("Nothing provides dependency %s" % item)
+            bb.event.fire(bb.event.NoProvider(item,self.configuration.data))
+            return 0
+
+        all_p = self.status.providers[item]
+
+        for p in all_p:
+            if p in self.build_cache:
+                bb.debug(1, "already built %s in this run\n" % p)
+                return 1
+
+        eligible = self.filterProviders(all_p, item)
+
+        if not eligible:
+            return 0
+
+        prefervar = bb.data.getVar('PREFERRED_PROVIDER_%s' % item, self.configuration.data, 1)
         if prefervar:
             self.preferred[item] = prefervar
 
@@ -412,7 +516,7 @@ class BBCooker:
             for p in eligible:
                 pn = self.status.pkg_fn[p]
                 if self.preferred[item] == pn:
-                    if make.options.verbose:
+                    if self.configuration.verbose:
                         bb.note("selecting %s to satisfy %s due to PREFERRED_PROVIDERS" % (pn, item))
                     eligible.remove(p)
                     eligible = [p] + eligible
@@ -426,18 +530,156 @@ class BBCooker:
                     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):
+            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
 
+    def buildRProvider( self, item , buildAllDeps ):
+        """
+        Build something to provide a named runtime requirement
+        (takes item names from RDEPENDS/PACKAGES namespace)
+        """
+
+        fn = None
+        all_p = []
+        discriminated = False
+
+        if not buildAllDeps:
+            return True
+
+        all_p = self.getProvidersRun(item)
+
+        if not all_p:
+            bb.error("Nothing provides runtime dependency %s" % (item))
+            bb.event.fire(bb.event.NoProvider(item,self.configuration.data,runtime=True))
+            return False
+
+        for p in all_p:
+            if p in self.rbuild_cache:
+                bb.debug(2, "Already built %s providing runtime %s\n" % (p,item))
+                return True
+            if p in self.build_cache:
+                bb.debug(2, "Already built %s but adding any further RDEPENDS for %s\n" % (p, item))
+                return self.addRunDeps(p, item , buildAllDeps)
+
+        eligible = self.filterProviders(all_p, item)
+        if not eligible:
+            return 0
+
+        preferred = []
+        for p in eligible:
+            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
+
+    def getProvidersRun(self, rdepend):
+        """
+        Return any potential providers of runtime rdepend
+        """
+        rproviders = []
+
+        if rdepend in self.status.rproviders:
+            rproviders += self.status.rproviders[rdepend]
+
+        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)
+        the_data = self.pkgdata[fn]
+        pn = self.status.pkg_fn[fn]
+
+        if (item == pn):
+            rdepends += bb.utils.explode_deps(bb.data.getVar('RDEPENDS', the_data, True) or "")
+            rdepends += bb.utils.explode_deps(bb.data.getVar('RRECOMMENDS', the_data, True) or "")
+            rdepends += bb.utils.explode_deps(bb.data.getVar("RDEPENDS_%s" % pn, the_data, True) or "")
+            rdepends += bb.utils.explode_deps(bb.data.getVar('RRECOMMENDS_%s' % pn, the_data, True) or "")
+        else:
+            packages = (bb.data.getVar('PACKAGES', the_data, 1).split() or "")
+            for package in packages:
+                if package == item:
+                    rdepends += bb.utils.explode_deps(bb.data.getVar("RDEPENDS_%s" % package, the_data, True) or "")
+                    rdepends += bb.utils.explode_deps(bb.data.getVar("RRECOMMENDS_%s" % package, the_data, True) or "")
+
+        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
@@ -449,17 +691,22 @@ 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', self.configuration.data, 1) or "").split():
             (providee, provider) = p.split(':')
             if providee in self.preferred and self.preferred[providee] != provider:
                 bb.error("conflicting preferences for %s: both %s and %s specified" % (providee, provider, self.preferred[providee]))
             self.preferred[providee] = provider
 
         # Calculate priorities for each file
-        for p in make.pkgdata.keys():
+        for p in self.pkgdata.keys():
             self.status.bbfile_priority[p] = calc_bbfile_priority(p)
 
-        # Build package list for "bitbake world"
+    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
@@ -506,27 +753,28 @@ class BBCooker:
         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 parseConfigurationFile( self, afile ):
         try:
-            make.cfg = bb.parse.handle( afile, make.cfg )
+            self.configuration.data = bb.parse.handle( afile, self.configuration.data )
         except IOError:
             bb.fatal( "Unable to open %s" % afile )
-        except bb.parse.ParseError:
-            bb.fatal( "Unable to parse %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, 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)
                     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)
                     continue
@@ -542,32 +790,40 @@ class BBCooker:
                     bb.error("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 ):
+        self.configuration = configuration
+
+        if not self.configuration.cmd:
+            self.configuration.cmd = "build"
 
-        if make.options.debug:
-            bb.debug_level = make.options.debug
+        if self.configuration.debug:
+            bb.debug_level = self.configuration.debug
 
-        make.cfg = bb.data.init()
+        self.configuration.data = bb.data.init()
 
-        for f in make.options.file:
+        for f in self.configuration.file:
             self.parseConfigurationFile( f )
 
         self.parseConfigurationFile( 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)
+        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", make.cfg)
+        buildname = bb.data.getVar("BUILDNAME", self.configuration.data)
 
-        if make.options.interactive:
+        if self.configuration.interactive:
             self.interactiveMode()
 
-        if make.options.buildfile is not None:
-            bf = os.path.abspath( make.options.buildfile )
+        if self.configuration.buildfile is not None:
+            bf = os.path.abspath( self.configuration.buildfile )
             try:
-                bbfile_data = bb.parse.handle(bf, make.cfg)
+                bbfile_data = bb.parse.handle(bf, self.configuration.data)
             except IOError:
                 bb.fatal("Unable to open %s" % bf)
 
@@ -582,10 +838,10 @@ class BBCooker:
         # initialise the parsing status now we know we will need deps
         self.status = BBParsingStatus()
 
-        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:
@@ -593,53 +849,57 @@ 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.")
             else:
-                psyco.bind( make.collect_bbfiles )
+                psyco.bind( self.collect_bbfiles )
         else:
             bb.note("You have disabled Psyco. This decreases performance.")
 
         try:
             bb.debug(1, "collecting .bb files")
-            make.collect_bbfiles( self.myProgressCallback )
+            self.collect_bbfiles( self.myProgressCallback )
             bb.debug(1, "parsing complete")
             if bbdebug == 0:
                 print
-            if make.options.parse_only:
+            if self.configuration.parse_only:
                 print "Requested parsing .bb files only.  Exiting."
                 return
 
-            bb.data.update_data( make.cfg )
+            bb.data.update_data( self.configuration.data )
             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))
+            bb.event.fire(bb.event.BuildStarted(buildname, pkgs_to_build, self.configuration.data))
 
+            failures = 0
             for k in pkgs_to_build:
                 failed = False
                 try:
-                    if self.buildProvider( k ) == 0:
+                    if self.buildProvider( k , False ) == 0:
                         # already diagnosed
                         failed = True
                 except bb.build.EventException:
@@ -647,10 +907,11 @@ class BBCooker:
                     failed = True
 
                 if failed:
-                    if make.options.abort:
+                    failures += failures
+                    if self.configuration.abort:
                         sys.exit(1)
 
-            bb.event.fire(bb.event.BuildCompleted(buildname, pkgs_to_build, make.cfg))
+            bb.event.fire(bb.event.BuildCompleted(buildname, pkgs_to_build, self.configuration.data, failures))
 
             sys.exit( self.stats.show() )
 
@@ -658,12 +919,169 @@ class BBCooker:
             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
+
+    def find_bbfiles( self, path ):
+        """Find all the .bb files in a directory (uses find)"""
+        findcmd = 'find ' + path + ' -name *.bb | grep -v SCCS/'
+        try:
+            finddata = os.popen(findcmd)
+        except OSError:
+            return []
+        return finddata.readlines()
+
+    def deps_clean(self, d):
+        depstr = data.getVar('__depends', d)
+        if depstr:
+            deps = depstr.split(" ")
+            for dep in deps:
+                (f,old_mtime_s) = dep.split("@")
+                old_mtime = int(old_mtime_s)
+                new_mtime = parse.cached_mtime(f)
+                if (new_mtime > old_mtime):
+                    return False
+        return True
+
+    def load_bbfile( self, bbfile ):
+        """Load and parse one .bb build file"""
+
+        if not self.cache in [None, '']:
+            # get the times
+            cache_mtime = data.init_db_mtime(self.cache, bbfile)
+            file_mtime = parse.cached_mtime(bbfile)
+
+            if file_mtime > cache_mtime:
+                #print " : '%s' dirty. reparsing..." % bbfile
+                pass
+            else:
+                #print " : '%s' clean. loading from cache..." % bbfile
+                cache_data = data.init_db( self.cache, bbfile, False )
+                if self.deps_clean(cache_data):
+                    return cache_data, True
+
+        topdir = data.getVar('TOPDIR', self.configuration.data)
+        if not topdir:
+            topdir = os.path.abspath(os.getcwd())
+            # set topdir to here
+            data.setVar('TOPDIR', topdir, self.configuration)
+        bbfile = os.path.abspath(bbfile)
+        bbfile_loc = os.path.abspath(os.path.dirname(bbfile))
+        # expand tmpdir to include this topdir
+        data.setVar('TMPDIR', data.getVar('TMPDIR', self.configuration.data, 1) or "", self.configuration.data)
+        # set topdir to location of .bb file
+        topdir = bbfile_loc
+        #data.setVar('TOPDIR', topdir, cfg)
+        # go there
+        oldpath = os.path.abspath(os.getcwd())
+        os.chdir(topdir)
+        bb = data.init_db(self.cache,bbfile, True, self.configuration.data)
+        try:
+            parse.handle(bbfile, bb) # read .bb data
+            if not self.cache in [None, '']:
+                bb.commit(parse.cached_mtime(bbfile)) # write cache
+            os.chdir(oldpath)
+            return bb, False
+        finally:
+            os.chdir(oldpath)
+
+    def collect_bbfiles( self, progressCallback ):
+        """Collect all available .bb build files"""
+        self.cb = progressCallback
+        parsed, cached, skipped, masked = 0, 0, 0, 0
+        self.cache   = bb.data.getVar( "CACHE", self.configuration.data, 1 )
+        self.pkgdata = data.pkgdata( not self.cache in [None, ''], self.cache, self.configuration.data )
+
+        if not self.cache in [None, '']:
+            if self.cb is not None:
+                print "NOTE: Using cache in '%s'" % self.cache
+            try:
+                os.stat( self.cache )
+            except OSError:
+                bb.mkdirhier( self.cache )
+        else:
+            if self.cb is not None:
+                print "NOTE: Not using a cache. Set CACHE = <directory> to enable."
+        files = (data.getVar( "BBFILES", self.configuration.data, 1 ) or "").split()
+        data.setVar("BBFILES", " ".join(files), self.configuration.data)
+
+        if not len(files):
+            files = self.get_bbfiles()
+
+        if not len(files):
+            bb.error("no files to build.")
+
+        newfiles = []
+        for f in files:
+            if os.path.isdir(f):
+                dirfiles = self.find_bbfiles(f)
+                if dirfiles:
+                    newfiles += dirfiles
+                    continue
+            newfiles += glob.glob(f) or [ f ]
+
+        bbmask = bb.data.getVar('BBMASK', self.configuration.data, 1) or ""
+        try:
+            bbmask_compiled = re.compile(bbmask)
+        except sre_constants.error:
+            bb.fatal("BBMASK is not a valid regular expression.")
+
+        for i in xrange( len( newfiles ) ):
+            f = newfiles[i]
+            if bbmask and bbmask_compiled.search(f):
+                bb.debug(1, "bbmake: skipping %s" % f)
+                masked += 1
+                continue
+            debug(1, "bbmake: parsing %s" % f)
+
+            # read a file's metadata
+            try:
+                bb_data, fromCache = self.load_bbfile(f)
+                if fromCache: cached += 1
+                else: parsed += 1
+                deps = None
+                if bb_data is not None:
+                    # allow metadata files to add items to BBFILES
+                    #data.update_data(self.pkgdata[f])
+                    addbbfiles = data.getVar('BBFILES', bb_data) or None
+                    if addbbfiles:
+                        for aof in addbbfiles.split():
+                            if not files.count(aof):
+                                if not os.path.isabs(aof):
+                                    aof = os.path.join(os.path.dirname(f),aof)
+                                files.append(aof)
+                    self.pkgdata[f] = bb_data
+
+                # now inform the caller
+                if self.cb is not None:
+                    self.cb( i + 1, len( newfiles ), f, bb_data, fromCache )
+
+            except IOError, e:
+                bb.error("opening %s: %s" % (f, e))
+                pass
+            except bb.parse.SkipPackage:
+                skipped += 1
+                pass
+            except KeyboardInterrupt:
+                raise
+            except Exception, e:
+                bb.error("%s while parsing %s" % (e, f))
+
+        if self.cb is not None:
+            print "\rNOTE: Parsing finished. %d cached, %d parsed, %d skipped, %d masked." % ( cached, parsed, skipped, masked ),
+
 #============================================================================#
 # main
 #============================================================================#
 
-if __name__ == "__main__":
-
+def main():
     parser = optparse.OptionParser( version = "BitBake Build Tool Core version %s, %%prog version %s" % ( bb.__version__, __version__ ),
     usage = """%prog [options] [package ...]
 
@@ -684,7 +1102,7 @@ Default BBFILES are the .bb files in the current directory.""" )
     parser.add_option( "-i", "--interactive", help = "drop into the interactive mode.",
                action = "store_true", dest = "interactive", default = False )
 
-    parser.add_option( "-c", "--cmd", help = "Specify task to execute",
+    parser.add_option( "-c", "--cmd", help = "Specify task to execute. Note that this only executes the specified task for the providee and the packages it depends on, i.e. 'compile' does not implicitly call stage for the dependencies (IOW: use only if you know what you are doing)",
                action = "store", dest = "cmd", default = "build" )
 
     parser.add_option( "-r", "--read", help = "read the specified file before bitbake.conf",
@@ -708,8 +1126,15 @@ 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 )
+
     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__":
+    main()