diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2008-10-28 22:15:06 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2008-10-28 22:15:06 +0000 |
commit | b296ae263ce12294a7264ed09b987acda73e4f67 (patch) | |
tree | 9c0dfd5439d9d27f74b36f9731afb01c0c018531 /bitbake/lib/bb | |
parent | db140d9ce0a5918cab2615862402c07ef81c6944 (diff) | |
download | poky-b296ae263ce12294a7264ed09b987acda73e4f67.tar.gz |
bitbake: Add tryaltconfigs option to disable the alternative configuration attempts and make the 'continue' more aggresive
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 8 | ||||
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 4 | ||||
-rw-r--r-- | bitbake/lib/bb/taskdata.py | 3 |
3 files changed, 9 insertions, 6 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 7477ee6c6f..c5d640da80 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -194,7 +194,7 @@ class BBCooker: | |||
194 | bb.data.update_data(localdata) | 194 | bb.data.update_data(localdata) |
195 | bb.data.expandKeys(localdata) | 195 | bb.data.expandKeys(localdata) |
196 | 196 | ||
197 | taskdata = bb.taskdata.TaskData(self.configuration.abort) | 197 | taskdata = bb.taskdata.TaskData(self.configuration.abort, self.configuration.tryaltconfigs) |
198 | 198 | ||
199 | try: | 199 | try: |
200 | taskdata.add_provider(localdata, self.status, pkgs_to_build[0]) | 200 | taskdata.add_provider(localdata, self.status, pkgs_to_build[0]) |
@@ -243,7 +243,7 @@ class BBCooker: | |||
243 | localdata = data.createCopy(self.configuration.data) | 243 | localdata = data.createCopy(self.configuration.data) |
244 | bb.data.update_data(localdata) | 244 | bb.data.update_data(localdata) |
245 | bb.data.expandKeys(localdata) | 245 | bb.data.expandKeys(localdata) |
246 | taskdata = bb.taskdata.TaskData(self.configuration.abort) | 246 | taskdata = bb.taskdata.TaskData(self.configuration.abort, self.configuration.tryaltconfigs) |
247 | 247 | ||
248 | runlist = [] | 248 | runlist = [] |
249 | try: | 249 | try: |
@@ -500,7 +500,7 @@ class BBCooker: | |||
500 | bb.build.del_stamp('do_%s' % self.configuration.cmd, self.configuration.data) | 500 | bb.build.del_stamp('do_%s' % self.configuration.cmd, self.configuration.data) |
501 | 501 | ||
502 | # Setup taskdata structure | 502 | # Setup taskdata structure |
503 | taskdata = bb.taskdata.TaskData(self.configuration.abort) | 503 | taskdata = bb.taskdata.TaskData(self.configuration.abort, self.configuration.tryaltconfigs) |
504 | taskdata.add_provider(self.configuration.data, self.status, item) | 504 | taskdata.add_provider(self.configuration.data, self.status, item) |
505 | 505 | ||
506 | buildname = bb.data.getVar("BUILDNAME", self.configuration.data) | 506 | buildname = bb.data.getVar("BUILDNAME", self.configuration.data) |
@@ -534,7 +534,7 @@ class BBCooker: | |||
534 | bb.data.update_data(localdata) | 534 | bb.data.update_data(localdata) |
535 | bb.data.expandKeys(localdata) | 535 | bb.data.expandKeys(localdata) |
536 | 536 | ||
537 | taskdata = bb.taskdata.TaskData(self.configuration.abort) | 537 | taskdata = bb.taskdata.TaskData(self.configuration.abort, self.configuration.tryaltconfigs) |
538 | 538 | ||
539 | runlist = [] | 539 | runlist = [] |
540 | try: | 540 | try: |
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 62bd10ae24..2df51de75a 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -845,7 +845,7 @@ class RunQueue: | |||
845 | failed_fnids = self.finish_runqueue() | 845 | failed_fnids = self.finish_runqueue() |
846 | if len(failed_fnids) == 0: | 846 | if len(failed_fnids) == 0: |
847 | return failures | 847 | return failures |
848 | if self.taskData.abort: | 848 | if not self.taskData.tryaltconfigs: |
849 | raise bb.runqueue.TaskFailure(failed_fnids) | 849 | raise bb.runqueue.TaskFailure(failed_fnids) |
850 | for fnid in failed_fnids: | 850 | for fnid in failed_fnids: |
851 | #print "Failure: %s %s %s" % (fnid, self.taskData.fn_index[fnid], self.runq_task[fnid]) | 851 | #print "Failure: %s %s %s" % (fnid, self.taskData.fn_index[fnid], self.runq_task[fnid]) |
@@ -970,6 +970,8 @@ class RunQueue: | |||
970 | bb.msg.error(bb.msg.domain.RunQueue, "Task %s (%s) failed" % (task, self.get_user_idstring(task))) | 970 | bb.msg.error(bb.msg.domain.RunQueue, "Task %s (%s) failed" % (task, self.get_user_idstring(task))) |
971 | self.failed_fnids.append(self.runq_fnid[task]) | 971 | self.failed_fnids.append(self.runq_fnid[task]) |
972 | self.stats.taskFailed() | 972 | self.stats.taskFailed() |
973 | if not self.taskData.abort: | ||
974 | continue | ||
973 | break | 975 | break |
974 | self.task_complete(task) | 976 | self.task_complete(task) |
975 | self.stats.taskCompleted() | 977 | self.stats.taskCompleted() |
diff --git a/bitbake/lib/bb/taskdata.py b/bitbake/lib/bb/taskdata.py index 566614ee63..782dfb0b78 100644 --- a/bitbake/lib/bb/taskdata.py +++ b/bitbake/lib/bb/taskdata.py | |||
@@ -30,7 +30,7 @@ class TaskData: | |||
30 | """ | 30 | """ |
31 | BitBake Task Data implementation | 31 | BitBake Task Data implementation |
32 | """ | 32 | """ |
33 | def __init__(self, abort = True): | 33 | def __init__(self, abort = True, tryaltconfigs = False): |
34 | self.build_names_index = [] | 34 | self.build_names_index = [] |
35 | self.run_names_index = [] | 35 | self.run_names_index = [] |
36 | self.fn_index = [] | 36 | self.fn_index = [] |
@@ -57,6 +57,7 @@ class TaskData: | |||
57 | self.failed_fnids = [] | 57 | self.failed_fnids = [] |
58 | 58 | ||
59 | self.abort = abort | 59 | self.abort = abort |
60 | self.tryaltconfigs = tryaltconfigs | ||
60 | 61 | ||
61 | def getbuild_id(self, name): | 62 | def getbuild_id(self, name): |
62 | """ | 63 | """ |