From 767c7ba8fc76ec667ac1567de1c971c3575f2ecd Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 31 Aug 2017 17:32:15 +0100 Subject: 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 --- lib/bb/cookerdata.py | 2 +- lib/bb/main.py | 5 ----- lib/bb/runqueue.py | 7 +------ lib/bb/taskdata.py | 3 +-- 4 files changed, 3 insertions(+), 14 deletions(-) (limited to 'lib') diff --git a/lib/bb/cookerdata.py b/lib/bb/cookerdata.py index 2c9019f81..fab47c75f 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 6e6a346a0..a488c3d18 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 e1a15af26..6b3a0fcfb 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 8c96a5628..0ea6c0bfd 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 -- cgit 1.2.3-korg