bitbake: Add --skip-setscene option
PATCH 1/1 bitbake: Add --skip-setscene option
Adds an option to skip _setscene only if they would normally be executed, without ignoring sstate completely.
Previously, '--no-setscene' would allow a build that completely ignored sstate and _setscene tasks, and '--setscene-only' would allow a build that only ran _setscene tasks, but there was no option do a build that would respect tasks previously restored from sstate and build everything else. Now one can run:
bitbake --setscene-only IMAGE; bitbake --skip-setscene IMAGE
which is functionally equivalent to:
bitbake IMAGE
The indented use is to allow a build to complete successfully in the presence of _setscene task failures by splitting apart the two phases e.g.:
(bitbake -k --setscene-only IMAGE || true) && bitbake --skip-setscene IMAGE
--- bitbake/lib/bb/cookerdata.py | 1 + bitbake/lib/bb/main.py | 5 +++++ bitbake/lib/bb/runqueue.py | 5 +++++ 3 files changed, 11 insertions(+)
bitbake/lib/bb/cookerdata.py +1 -0
@@ -122,6 +122,7 @@ class CookerConfiguration(object): self.profile = False self.nosetscene = False self.setsceneonly = False + self.skipsetscene = False self.invalidate_stamp = False self.dump_signatures = [] self.dry_run = False
bitbake/lib/bb/main.py +5 -0
@@ -255,6 +255,11 @@ class BitBakeConfigParameters(cookerdata.ConfigParameters): help="Do not run any setscene tasks. sstate will be ignored and " "everything needed, built.") + parser.add_option("", "--skip-setscene", action="store_true", + dest="skipsetscene", default=False, + help="Skip setscene tasks if they would be executed. Tasks previously " + "restored from sstate will be kept, unlike --no-setscene") + parser.add_option("", "--setscene-only", action="store_true", dest="setsceneonly", default=False, help="Only run setscene tasks, don't run any real tasks.")
bitbake/lib/bb/runqueue.py +5 -0
@@ -2489,6 +2489,11 @@ class RunQueueExecuteScenequeue(RunQueueExecute): self.task_skip(task) return True + if self.cooker.configuration.skipsetscene: + logger.debug(2, 'No setscene tasks should be executed. Skipping %s', task) + self.task_failoutright(task) + return True + startevent = sceneQueueTaskStarted(task, self.stats, self.rq) bb.event.fire(startevent, self.cfgData)
Signature · 1 line
2.21.0