Patchwork [bitbake-devel] bitbake, runqueue: Add --no-setscene to skip all setscene tasks

login
mail settings
Submitter Jason Wessel
Date Sept. 17, 2012, 10:43 p.m.
Message ID <1347921797-60524-1-git-send-email-jason.wessel@windriver.com>
Download mbox | patch
Permalink /patch/36663/
State Accepted
Commit 440e479f3e248482c38c149643403c6907ac7034
Headers show

Comments

Jason Wessel - Sept. 17, 2012, 10:43 p.m.
Mainly intended for the purpose of debugging or forcing builds
from source, the --no-setscene will prevent any setscene
tasks from running.

(LOCAL REV: NOT UPSTREAM)

Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
---
 bin/bitbake        |    2 ++
 lib/bb/runqueue.py |   13 +++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)
Richard Purdie - Sept. 24, 2012, 2:32 p.m.
On Mon, 2012-09-17 at 17:43 -0500, Jason Wessel wrote:
> Mainly intended for the purpose of debugging or forcing builds
> from source, the --no-setscene will prevent any setscene
> tasks from running.
> 
> (LOCAL REV: NOT UPSTREAM)
> 
> Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
> ---
>  bin/bitbake        |    2 ++
>  lib/bb/runqueue.py |   13 +++++++------
>  2 files changed, 9 insertions(+), 6 deletions(-)

Merged to master, thanks.

Richard

Patch

diff --git a/bin/bitbake b/bin/bitbake
index c000d98..37c1045 100755
--- a/bin/bitbake
+++ b/bin/bitbake
@@ -182,6 +182,8 @@  Default BBFILES are the .bb files in the current directory.""")
 
     parser.add_option("-B", "--bind", help = "The name/address for the bitbake server to bind to",
                action = "store", dest = "bind", default = False)
+    parser.add_option("", "--no-setscene", help = "Do not run any setscene tasks, forces builds",
+               action = "store_true", dest = "nosetscene", default = False)
     options, args = parser.parse_args(sys.argv)
 
     configuration = BBConfiguration(options)
diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py
index bc2eb87..cd67607 100644
--- a/lib/bb/runqueue.py
+++ b/lib/bb/runqueue.py
@@ -692,13 +692,14 @@  class RunQueueData:
             stampfnwhitelist.append(fn)
         self.stampfnwhitelist = stampfnwhitelist
 
-        # Interate over the task list looking for tasks with a 'setscene' function
+        # Iterate over the task list looking for tasks with a 'setscene' function
         self.runq_setscene = []
-        for task in range(len(self.runq_fnid)):
-            setscene = taskData.gettask_id(self.taskData.fn_index[self.runq_fnid[task]], self.runq_task[task] + "_setscene", False)
-            if not setscene:
-                continue
-            self.runq_setscene.append(task)
+        if not self.cooker.configuration.nosetscene:
+            for task in range(len(self.runq_fnid)):
+                setscene = taskData.gettask_id(self.taskData.fn_index[self.runq_fnid[task]], self.runq_task[task] + "_setscene", False)
+                if not setscene:
+                    continue
+                self.runq_setscene.append(task)
 
         def invalidate_task(fn, taskname, error_nostamp):
             taskdep = self.dataCache.task_deps[fn]