diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2006-11-12 19:20:50 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2006-11-12 19:20:50 +0000 |
commit | 4bb7faebc5f7261ed6972eb944fe60257283229d (patch) | |
tree | 61648156e25b58c5ddfa19f9dd15d29084d85773 /bin | |
parent | d3b3f4f43b92d905e710bc9d242f9d8b7159198b (diff) | |
download | bitbake-4bb7faebc5f7261ed6972eb944fe60257283229d.tar.gz |
bitbake: Add calls to expandKeys, fixing issues in bug #1294
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/bitbake | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/bin/bitbake b/bin/bitbake index 0982d86bb..ed05cc753 100755 --- a/bin/bitbake +++ b/bin/bitbake @@ -179,6 +179,7 @@ class BBCooker: except Exception, e: bb.msg.fatal(bb.msg.domain.Parsing, "%s" % e) # emit the metadata which isnt valid shell + data.expandKeys( self.configuration.data ) for e in self.configuration.data.keys(): if data.getVarFlag( e, 'python', self.configuration.data ): sys.__stdout__.write("\npython %s () {\n%s}\n" % (e, data.getVar(e, self.configuration.data, 1))) @@ -357,6 +358,7 @@ class BBCooker: localdata = data.createCopy(self.configuration.data) bb.data.update_data(localdata) + bb.data.expandKeys(localdata) def calc_bbfile_priority(filename): for (regex, pri) in self.status.bbfile_config_priorities: @@ -424,6 +426,7 @@ class BBCooker: bb.msg.fatal(bb.msg.domain.Parsing, "Sorry, shell not available (%s)" % details ) else: bb.data.update_data( self.configuration.data ) + bb.data.expandKeys(localdata) shell.start( self ) sys.exit( 0 ) @@ -617,14 +620,18 @@ class BBCooker: bb.event.fire(bb.event.BuildStarted(buildname, pkgs_to_build, self.configuration.event_data)) + localdata = data.createCopy(self.configuration.data) + bb.data.update_data(localdata) + bb.data.expandKeys(localdata) + taskdata = bb.taskdata.TaskData(self.configuration.abort) runlist = [] try: for k in pkgs_to_build: - taskdata.add_provider(self.configuration.data, self.status, k) + taskdata.add_provider(localdata, self.status, k) runlist.append([k, "do_%s" % self.configuration.cmd]) - taskdata.add_unresolved(self.configuration.data, self.status) + taskdata.add_unresolved(localdata, self.status) except bb.providers.NoProvider: sys.exit(1) |