summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-31 17:32:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-31 23:30:41 +0100
commit767c7ba8fc76ec667ac1567de1c971c3575f2ecd (patch)
treed4ee1acef70503c15852dabb1076f09a62d52e7a /lib
parent2a78c2d09aea0323632bbc927f370f1d3c9c249e (diff)
downloadbitbake-contrib-767c7ba8fc76ec667ac1567de1c971c3575f2ecd.tar.gz
bitbake-contrib-767c7ba8fc76ec667ac1567de1c971c3575f2ecd.tar.bz2
bitbake-contrib-767c7ba8fc76ec667ac1567de1c971c3575f2ecd.zip
cookerdata/taskdata/runqueue: Drop remaining tryaltconfigs code and commandline option
I can't actually see how this was working, nothing connected the commandline option to the data in TaskData(). Drop the remaining pieces of this option, it was a relic from a decade ago and we want deterministic builds, not random tries until something might work. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/bb/cookerdata.py2
-rwxr-xr-xlib/bb/main.py5
-rw-r--r--lib/bb/runqueue.py7
-rw-r--r--lib/bb/taskdata.py3
4 files changed, 3 insertions, 14 deletions
diff --git a/lib/bb/cookerdata.py b/lib/bb/cookerdata.py
index 2c9019f81f..fab47c75f5 100644
--- a/lib/bb/cookerdata.py
+++ b/lib/bb/cookerdata.py
@@ -69,7 +69,7 @@ class ConfigParameters(object):
def updateToServer(self, server, environment):
options = {}
- for o in ["abort", "tryaltconfigs", "force", "invalidate_stamp",
+ for o in ["abort", "force", "invalidate_stamp",
"verbose", "debug", "dry_run", "dump_signatures",
"debug_domains", "extra_assume_provided", "profile",
"prefile", "postfile", "server_timeout"]:
diff --git a/lib/bb/main.py b/lib/bb/main.py
index 6e6a346a06..a488c3d18e 100755
--- a/lib/bb/main.py
+++ b/lib/bb/main.py
@@ -150,11 +150,6 @@ class BitBakeConfigParameters(cookerdata.ConfigParameters):
"failed and anything depending on it cannot be built, as much as "
"possible will be built before stopping.")
- parser.add_option("-a", "--tryaltconfigs", action="store_true",
- dest="tryaltconfigs", default=False,
- help="Continue with builds by trying to use alternative providers "
- "where possible.")
-
parser.add_option("-f", "--force", action="store_true", dest="force", default=False,
help="Force the specified targets/task to run (invalidating any "
"existing stamp file).")
diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py
index e1a15af260..6b3a0fcfb6 100644
--- a/lib/bb/runqueue.py
+++ b/lib/bb/runqueue.py
@@ -1355,12 +1355,7 @@ class RunQueue:
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)
if self.state is runQueueFailed:
- if not self.rqdata.taskData[''].tryaltconfigs:
- raise bb.runqueue.TaskFailure(self.rqexe.failed_tids)
- for tid in self.rqexe.failed_tids:
- (mc, fn, tn, _) = split_tid_mcfn(tid)
- self.rqdata.taskData[mc].fail_fn(fn)
- self.rqdata.reset()
+ raise bb.runqueue.TaskFailure(self.rqexe.failed_tids)
if self.state is runQueueComplete:
# All done
diff --git a/lib/bb/taskdata.py b/lib/bb/taskdata.py
index 8c96a56285..0ea6c0bfd6 100644
--- a/lib/bb/taskdata.py
+++ b/lib/bb/taskdata.py
@@ -47,7 +47,7 @@ class TaskData:
"""
BitBake Task Data implementation
"""
- def __init__(self, abort = True, tryaltconfigs = False, skiplist = None, allowincomplete = False):
+ def __init__(self, abort = True, skiplist = None, allowincomplete = False):
self.build_targets = {}
self.run_targets = {}
@@ -66,7 +66,6 @@ class TaskData:
self.failed_fns = []
self.abort = abort
- self.tryaltconfigs = tryaltconfigs
self.allowincomplete = allowincomplete
self.skiplist = skiplist