sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: cooker/command: Drop expanded_data 

Some of our metadata assumes that BuildStarted and BuildCompleted events
see the same data store. This is the case for buildTarget but not for
buildFile and recent changes mean this is now a problem.

The update_data() call is now an empty operation and there is no difference
between the expanded_data and data so we can simply remove the expanded_data
and its references and use data everywhere. This has been inteded for a while
but the above issue makes this more pressing to finally clean up.

(Bitbake rev: e3694e738e98f26f413ada6860ca7d829d3662f0)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2016-12-15 09:36:30 +00:00
parent 97f83e911e
commit 2c4e366721
3 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bitbake/lib/bb/command.py
View File

@ -133,11 +133,11 @@ class Command:
def finishAsyncCommand(self, msg=None, code=None): def finishAsyncCommand(self, msg=None, code=None):
if msg or msg == "": if msg or msg == "":
bb.event.fire(CommandFailed(msg), self.cooker.expanded_data) bb.event.fire(CommandFailed(msg), self.cooker.data)
elif code: elif code:
bb.event.fire(CommandExit(code), self.cooker.expanded_data) bb.event.fire(CommandExit(code), self.cooker.data)
else: else:
bb.event.fire(CommandCompleted(), self.cooker.expanded_data) bb.event.fire(CommandCompleted(), self.cooker.data)
self.currentAsyncCommand = None self.currentAsyncCommand = None
self.cooker.finishcommand() self.cooker.finishcommand()

26
bitbake/lib/bb/cooker.py
View File

@ -367,9 +367,7 @@ class BBCooker:
# Copy of the data store which has been expanded. # Copy of the data store which has been expanded.
# Used for firing events and accessing variables where expansion needs to be accounted for # Used for firing events and accessing variables where expansion needs to be accounted for
# #
self.expanded_data = bb.data.createCopy(self.data) bb.parse.init_parser(self.data)
bb.data.update_data(self.expanded_data)
bb.parse.init_parser(self.expanded_data)
if CookerFeatures.BASEDATASTORE_TRACKING in self.featureset: if CookerFeatures.BASEDATASTORE_TRACKING in self.featureset:
self.disableDataTracking() self.disableDataTracking()
@ -619,7 +617,7 @@ class BBCooker:
fn = self.matchFile(fn) fn = self.matchFile(fn)
fn = bb.cache.realfn2virtual(fn, cls, mc) fn = bb.cache.realfn2virtual(fn, cls, mc)
elif len(pkgs_to_build) == 1: elif len(pkgs_to_build) == 1:
ignore = self.expanded_data.getVar("ASSUME_PROVIDED") or "" ignore = self.data.getVar("ASSUME_PROVIDED") or ""
if pkgs_to_build[0] in set(ignore.split()): if pkgs_to_build[0] in set(ignore.split()):
bb.fatal("%s is in ASSUME_PROVIDED" % pkgs_to_build[0]) bb.fatal("%s is in ASSUME_PROVIDED" % pkgs_to_build[0])
@ -1090,7 +1088,7 @@ class BBCooker:
def findBestProvider(self, pn, mc=''): def findBestProvider(self, pn, mc=''):
if pn in self.recipecaches[mc].providers: if pn in self.recipecaches[mc].providers:
filenames = self.recipecaches[mc].providers[pn] filenames = self.recipecaches[mc].providers[pn]
eligible, foundUnique = bb.providers.filterProviders(filenames, pn, self.expanded_data, self.recipecaches[mc]) eligible, foundUnique = bb.providers.filterProviders(filenames, pn, self.data, self.recipecaches[mc])
filename = eligible[0] filename = eligible[0]
return None, None, None, filename return None, None, None, filename
elif pn in self.recipecaches[mc].pkg_pn: elif pn in self.recipecaches[mc].pkg_pn:
@ -1304,7 +1302,7 @@ class BBCooker:
bf = os.path.abspath(bf) bf = os.path.abspath(bf)
self.collection = CookerCollectFiles(self.bbfile_config_priorities) self.collection = CookerCollectFiles(self.bbfile_config_priorities)
filelist, masked = self.collection.collect_bbfiles(self.data, self.expanded_data) filelist, masked = self.collection.collect_bbfiles(self.data, self.data)
try: try:
os.stat(bf) os.stat(bf)
bf = os.path.abspath(bf) bf = os.path.abspath(bf)
@ -1339,7 +1337,7 @@ class BBCooker:
""" """
Build the file matching regexp buildfile Build the file matching regexp buildfile
""" """
bb.event.fire(bb.event.BuildInit(), self.expanded_data) bb.event.fire(bb.event.BuildInit(), self.data)
if not hidewarning: if not hidewarning:
# Too many people use -b because they think it's how you normally # Too many people use -b because they think it's how you normally
@ -1399,7 +1397,7 @@ class BBCooker:
taskdata[mc].add_provider(self.data, self.recipecaches[mc], item) taskdata[mc].add_provider(self.data, self.recipecaches[mc], item)
buildname = self.data.getVar("BUILDNAME") buildname = self.data.getVar("BUILDNAME")
bb.event.fire(bb.event.BuildStarted(buildname, [item]), self.expanded_data) bb.event.fire(bb.event.BuildStarted(buildname, [item]), self.data)
# Execute the runqueue # Execute the runqueue
runlist = [[mc, item, task, fn]] runlist = [[mc, item, task, fn]]
@ -1429,7 +1427,7 @@ class BBCooker:
return False return False
if not retval: if not retval:
bb.event.fire(bb.event.BuildCompleted(len(rq.rqdata.runtaskentries), buildname, item, failures, interrupted), self.expanded_data) bb.event.fire(bb.event.BuildCompleted(len(rq.rqdata.runtaskentries), buildname, item, failures, interrupted), self.data)
self.command.finishAsyncCommand(msg) self.command.finishAsyncCommand(msg)
return False return False
if retval is True: if retval is True:
@ -1484,7 +1482,7 @@ class BBCooker:
packages = [target if ':' in target else '%s:%s' % (target, task) for target in targets] packages = [target if ':' in target else '%s:%s' % (target, task) for target in targets]
bb.event.fire(bb.event.BuildInit(packages), self.expanded_data) bb.event.fire(bb.event.BuildInit(packages), self.data)
taskdata, runlist = self.buildTaskData(targets, task, self.configuration.abort) taskdata, runlist = self.buildTaskData(targets, task, self.configuration.abort)
@ -1622,7 +1620,7 @@ class BBCooker:
self.recipecaches[mc].ignored_dependencies.add(dep) self.recipecaches[mc].ignored_dependencies.add(dep)
self.collection = CookerCollectFiles(self.bbfile_config_priorities) self.collection = CookerCollectFiles(self.bbfile_config_priorities)
(filelist, masked) = self.collection.collect_bbfiles(self.data, self.expanded_data) (filelist, masked) = self.collection.collect_bbfiles(self.data, self.data)
self.parser = CookerParser(self, filelist, masked) self.parser = CookerParser(self, filelist, masked)
self.parsecache_valid = True self.parsecache_valid = True
@ -1656,7 +1654,7 @@ class BBCooker:
if len(pkgs_to_build) == 0: if len(pkgs_to_build) == 0:
raise NothingToBuild raise NothingToBuild
ignore = (self.expanded_data.getVar("ASSUME_PROVIDED") or "").split() ignore = (self.data.getVar("ASSUME_PROVIDED") or "").split()
for pkg in pkgs_to_build: for pkg in pkgs_to_build:
if pkg in ignore: if pkg in ignore:
parselog.warning("Explicit target \"%s\" is in ASSUME_PROVIDED, ignoring" % pkg) parselog.warning("Explicit target \"%s\" is in ASSUME_PROVIDED, ignoring" % pkg)
@ -1689,13 +1687,13 @@ class BBCooker:
try: try:
self.prhost = prserv.serv.auto_start(self.data) self.prhost = prserv.serv.auto_start(self.data)
except prserv.serv.PRServiceConfigError: except prserv.serv.PRServiceConfigError:
bb.event.fire(CookerExit(), self.expanded_data) bb.event.fire(CookerExit(), self.data)
self.state = state.error self.state = state.error
return return
def post_serve(self): def post_serve(self):
prserv.serv.auto_shutdown(self.data) prserv.serv.auto_shutdown(self.data)
bb.event.fire(CookerExit(), self.expanded_data) bb.event.fire(CookerExit(), self.data)
lockfile = self.lock.name lockfile = self.lock.name
self.lock.close() self.lock.close()
self.lock = None self.lock = None

8
bitbake/lib/bb/runqueue.py
View File

@ -1341,7 +1341,7 @@ class RunQueue:
sq_hash.append(self.rqdata.runtaskentries[tid].hash) sq_hash.append(self.rqdata.runtaskentries[tid].hash)
sq_taskname.append(taskname) sq_taskname.append(taskname)
sq_task.append(tid) sq_task.append(tid)
locs = { "sq_fn" : sq_fn, "sq_task" : sq_taskname, "sq_hash" : sq_hash, "sq_hashfn" : sq_hashfn, "d" : self.cooker.expanded_data } locs = { "sq_fn" : sq_fn, "sq_task" : sq_taskname, "sq_hash" : sq_hash, "sq_hashfn" : sq_hashfn, "d" : self.cooker.data }
try: try:
call = self.hashvalidate + "(sq_fn, sq_task, sq_hash, sq_hashfn, d, siginfo=True)" call = self.hashvalidate + "(sq_fn, sq_task, sq_hash, sq_hashfn, d, siginfo=True)"
valid = bb.utils.better_eval(call, locs) valid = bb.utils.better_eval(call, locs)
@ -1525,7 +1525,7 @@ class RunQueueExecute:
pn = self.rqdata.dataCaches[mc].pkg_fn[fn] pn = self.rqdata.dataCaches[mc].pkg_fn[fn]
taskdata[dep] = [pn, taskname, fn] taskdata[dep] = [pn, taskname, fn]
call = self.rq.depvalidate + "(task, taskdata, notneeded, d)" call = self.rq.depvalidate + "(task, taskdata, notneeded, d)"
locs = { "task" : task, "taskdata" : taskdata, "notneeded" : self.scenequeue_notneeded, "d" : self.cooker.expanded_data } locs = { "task" : task, "taskdata" : taskdata, "notneeded" : self.scenequeue_notneeded, "d" : self.cooker.data }
valid = bb.utils.better_eval(call, locs) valid = bb.utils.better_eval(call, locs)
return valid return valid
@ -1593,7 +1593,7 @@ class RunQueueExecuteTasks(RunQueueExecute):
invalidtasks.append(tid) invalidtasks.append(tid)
call = self.rq.setsceneverify + "(covered, tasknames, fns, d, invalidtasks=invalidtasks)" call = self.rq.setsceneverify + "(covered, tasknames, fns, d, invalidtasks=invalidtasks)"
locs = { "covered" : self.rq.scenequeue_covered, "tasknames" : tasknames, "fns" : fns, "d" : self.cooker.expanded_data, "invalidtasks" : invalidtasks } locs = { "covered" : self.rq.scenequeue_covered, "tasknames" : tasknames, "fns" : fns, "d" : self.cooker.data, "invalidtasks" : invalidtasks }
covered_remove = bb.utils.better_eval(call, locs) covered_remove = bb.utils.better_eval(call, locs)
def removecoveredtask(tid): def removecoveredtask(tid):
@ -2086,7 +2086,7 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
sq_taskname.append(taskname) sq_taskname.append(taskname)
sq_task.append(tid) sq_task.append(tid)
call = self.rq.hashvalidate + "(sq_fn, sq_task, sq_hash, sq_hashfn, d)" call = self.rq.hashvalidate + "(sq_fn, sq_task, sq_hash, sq_hashfn, d)"
locs = { "sq_fn" : sq_fn, "sq_task" : sq_taskname, "sq_hash" : sq_hash, "sq_hashfn" : sq_hashfn, "d" : self.cooker.expanded_data } locs = { "sq_fn" : sq_fn, "sq_task" : sq_taskname, "sq_hash" : sq_hash, "sq_hashfn" : sq_hashfn, "d" : self.cooker.data }
valid = bb.utils.better_eval(call, locs) valid = bb.utils.better_eval(call, locs)
valid_new = stamppresent valid_new = stamppresent