summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/cookerdata.py2
-rwxr-xr-xbitbake/lib/bb/main.py5
-rw-r--r--bitbake/lib/bb/runqueue.py7
-rw-r--r--bitbake/lib/bb/taskdata.py3
4 files changed, 3 insertions, 14 deletions
diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py
index 2c9019f81f..fab47c75f5 100644
--- a/bitbake/lib/bb/cookerdata.py
+++ b/bitbake/lib/bb/cookerdata.py
@@ -69,7 +69,7 @@ class ConfigParameters(object):
69 69
70 def updateToServer(self, server, environment): 70 def updateToServer(self, server, environment):
71 options = {} 71 options = {}
72 for o in ["abort", "tryaltconfigs", "force", "invalidate_stamp", 72 for o in ["abort", "force", "invalidate_stamp",
73 "verbose", "debug", "dry_run", "dump_signatures", 73 "verbose", "debug", "dry_run", "dump_signatures",
74 "debug_domains", "extra_assume_provided", "profile", 74 "debug_domains", "extra_assume_provided", "profile",
75 "prefile", "postfile", "server_timeout"]: 75 "prefile", "postfile", "server_timeout"]:
diff --git a/bitbake/lib/bb/main.py b/bitbake/lib/bb/main.py
index 6e6a346a06..a488c3d18e 100755
--- a/bitbake/lib/bb/main.py
+++ b/bitbake/lib/bb/main.py
@@ -150,11 +150,6 @@ class BitBakeConfigParameters(cookerdata.ConfigParameters):
150 "failed and anything depending on it cannot be built, as much as " 150 "failed and anything depending on it cannot be built, as much as "
151 "possible will be built before stopping.") 151 "possible will be built before stopping.")
152 152
153 parser.add_option("-a", "--tryaltconfigs", action="store_true",
154 dest="tryaltconfigs", default=False,
155 help="Continue with builds by trying to use alternative providers "
156 "where possible.")
157
158 parser.add_option("-f", "--force", action="store_true", dest="force", default=False, 153 parser.add_option("-f", "--force", action="store_true", dest="force", default=False,
159 help="Force the specified targets/task to run (invalidating any " 154 help="Force the specified targets/task to run (invalidating any "
160 "existing stamp file).") 155 "existing stamp file).")
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index e1a15af260..6b3a0fcfb6 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -1355,12 +1355,7 @@ class RunQueue:
1355 logger.info("Tasks Summary: Attempted %d tasks of which %d didn't need to be rerun and all succeeded.", self.rqexe.stats.completed, self.rqexe.stats.skipped) 1355 logger.info("Tasks Summary: Attempted %d tasks of which %d didn't need to be rerun and all succeeded.", self.rqexe.stats.completed, self.rqexe.stats.skipped)
1356 1356
1357 if self.state is runQueueFailed: 1357 if self.state is runQueueFailed:
1358 if not self.rqdata.taskData[''].tryaltconfigs: 1358 raise bb.runqueue.TaskFailure(self.rqexe.failed_tids)
1359 raise bb.runqueue.TaskFailure(self.rqexe.failed_tids)
1360 for tid in self.rqexe.failed_tids:
1361 (mc, fn, tn, _) = split_tid_mcfn(tid)
1362 self.rqdata.taskData[mc].fail_fn(fn)
1363 self.rqdata.reset()
1364 1359
1365 if self.state is runQueueComplete: 1360 if self.state is runQueueComplete:
1366 # All done 1361 # All done
diff --git a/bitbake/lib/bb/taskdata.py b/bitbake/lib/bb/taskdata.py
index 8c96a56285..0ea6c0bfd6 100644
--- a/bitbake/lib/bb/taskdata.py
+++ b/bitbake/lib/bb/taskdata.py
@@ -47,7 +47,7 @@ class TaskData:
47 """ 47 """
48 BitBake Task Data implementation 48 BitBake Task Data implementation
49 """ 49 """
50 def __init__(self, abort = True, tryaltconfigs = False, skiplist = None, allowincomplete = False): 50 def __init__(self, abort = True, skiplist = None, allowincomplete = False):
51 self.build_targets = {} 51 self.build_targets = {}
52 self.run_targets = {} 52 self.run_targets = {}
53 53
@@ -66,7 +66,6 @@ class TaskData:
66 self.failed_fns = [] 66 self.failed_fns = []
67 67
68 self.abort = abort 68 self.abort = abort
69 self.tryaltconfigs = tryaltconfigs
70 self.allowincomplete = allowincomplete 69 self.allowincomplete = allowincomplete
71 70
72 self.skiplist = skiplist 71 self.skiplist = skiplist