summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-10-11 12:52:57 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-10-11 12:52:57 +0100
commitff539b11acca9831b72f3bc951a6ef20cd293786 (patch)
treed127343f934d16516f0feeebb76e17ea8164ce3e /bitbake
parentefe55d749ac0201d32587d94670fea46c8a98728 (diff)
downloadpoky-ff539b11acca9831b72f3bc951a6ef20cd293786.tar.gz
bitbake-runtask: Ensure logging options are inherited from the parent
[BUGID #291] Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake')
-rwxr-xr-xbitbake/bin/bitbake-runtask19
-rw-r--r--bitbake/lib/bb/runqueue.py3
2 files changed, 15 insertions, 7 deletions
diff --git a/bitbake/bin/bitbake-runtask b/bitbake/bin/bitbake-runtask
index 53049b83a4..3b37853f06 100755
--- a/bitbake/bin/bitbake-runtask
+++ b/bitbake/bin/bitbake-runtask
@@ -16,11 +16,13 @@ class BBConfiguration(object):
16 Manages build options and configurations for one run 16 Manages build options and configurations for one run
17 """ 17 """
18 18
19 def __init__(self): 19 def __init__(self, debug, debug_domains):
20 setattr(self, "data", {}) 20 setattr(self, "data", {})
21 setattr(self, "file", []) 21 setattr(self, "file", [])
22 setattr(self, "cmd", None) 22 setattr(self, "cmd", None)
23 setattr(self, "dump_signatures", True) 23 setattr(self, "dump_signatures", True)
24 setattr(self, "debug", debug)
25 setattr(self, "debug_domains", debug_domains)
24 26
25_warnings_showwarning = warnings.showwarning 27_warnings_showwarning = warnings.showwarning
26def _showwarning(message, category, filename, lineno, file=None, line=None): 28def _showwarning(message, category, filename, lineno, file=None, line=None):
@@ -66,13 +68,19 @@ os.setpgrp()
66bb.event.worker_pid = os.getpid() 68bb.event.worker_pid = os.getpid()
67bb.event.useStdout = False 69bb.event.useStdout = False
68 70
69import bb.cooker
70
71cooker = bb.cooker.BBCooker(BBConfiguration(), None)
72hashfile = sys.argv[1] 71hashfile = sys.argv[1]
73buildfile = sys.argv[2] 72buildfile = sys.argv[2]
74taskname = sys.argv[3] 73taskname = sys.argv[3]
75 74
75import bb.cooker
76
77p = pickle.Unpickler(file(hashfile, "rb"))
78hashdata = p.load()
79
80debug = hashdata["msg-debug"]
81debug_domains = hashdata["msg-debug-domains"]
82cooker = bb.cooker.BBCooker(BBConfiguration(debug, debug_domains), None)
83
76cooker.parseConfiguration() 84cooker.parseConfiguration()
77 85
78cooker.bb_cache = bb.cache.init(cooker) 86cooker.bb_cache = bb.cache.init(cooker)
@@ -92,9 +100,6 @@ cooker.bb_cache.handle_data(fn, cooker.status)
92if taskname.endswith("_setscene"): 100if taskname.endswith("_setscene"):
93 the_data.setVarFlag(taskname, "quieterrors", "1") 101 the_data.setVarFlag(taskname, "quieterrors", "1")
94 102
95p = pickle.Unpickler(file(hashfile, "rb"))
96hashdata = p.load()
97
98bb.parse.siggen.set_taskdata(hashdata["hashes"], hashdata["deps"]) 103bb.parse.siggen.set_taskdata(hashdata["hashes"], hashdata["deps"])
99 104
100for h in hashdata["hashes"]: 105for h in hashdata["hashes"]:
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 22b779436e..978e429d58 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -719,6 +719,9 @@ class RunQueueData:
719 deps.append(self.taskData.fn_index[self.runq_fnid[dep]] + "." + self.runq_task[dep]) 719 deps.append(self.taskData.fn_index[self.runq_fnid[dep]] + "." + self.runq_task[dep])
720 hashdata["deps"][self.taskData.fn_index[self.runq_fnid[task]] + "." + self.runq_task[task]] = deps 720 hashdata["deps"][self.taskData.fn_index[self.runq_fnid[task]] + "." + self.runq_task[task]] = deps
721 721
722 hashdata["msg-debug"] = self.cooker.configuration.debug
723 hashdata["msg-debug-domains"] = self.cooker.configuration.debug_domains
724
722 # Write out the hashes into a file for use by the individual tasks 725 # Write out the hashes into a file for use by the individual tasks
723 self.hashfile = bb.data.expand("${TMPDIR}/cache/hashdata.dat", self.cooker.configuration.data) 726 self.hashfile = bb.data.expand("${TMPDIR}/cache/hashdata.dat", self.cooker.configuration.data)
724 p = pickle.Pickler(file(self.hashfile, "wb"), -1) 727 p = pickle.Pickler(file(self.hashfile, "wb"), -1)