summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Witt <randy.e.witt@linux.intel.com>2016-10-11 15:36:19 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-11 23:43:16 +0100
commita75bccdd14cec2ce6b74a0e6dc3d557593f6abd2 (patch)
tree9f72ba5b45a6f3f9310a52c1841233aa87a3860a
parentf7259298a29e865dc03bde77e4617bc671a9c85e (diff)
downloadpoky-a75bccdd14cec2ce6b74a0e6dc3d557593f6abd2.tar.gz
bitbake: runqueue.py: Remove redundant whitelist checks
The whitelist checks for BB_SETSCENE_ENFORCE were running for every call to execute(). Since the task list doesn't change for each call into execute, the checks only need to be ran once. [YOCTO #10369] (Bitbake rev: f65e631ab6705dfd9188f19ee423eca33bca7d7d) Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/runqueue.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 13062630c0..84b268580f 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -265,6 +265,7 @@ class RunQueueData:
265 self.stampwhitelist = cfgData.getVar("BB_STAMP_WHITELIST", True) or "" 265 self.stampwhitelist = cfgData.getVar("BB_STAMP_WHITELIST", True) or ""
266 self.multi_provider_whitelist = (cfgData.getVar("MULTI_PROVIDER_WHITELIST", True) or "").split() 266 self.multi_provider_whitelist = (cfgData.getVar("MULTI_PROVIDER_WHITELIST", True) or "").split()
267 self.setscenewhitelist = get_setscene_enforce_whitelist(cfgData) 267 self.setscenewhitelist = get_setscene_enforce_whitelist(cfgData)
268 self.setscenewhitelist_checked = False
268 self.init_progress_reporter = bb.progress.DummyMultiStageProcessProgressReporter() 269 self.init_progress_reporter = bb.progress.DummyMultiStageProcessProgressReporter()
269 270
270 self.reset() 271 self.reset()
@@ -1701,7 +1702,9 @@ class RunQueueExecuteTasks(RunQueueExecute):
1701 Run the tasks in a queue prepared by rqdata.prepare() 1702 Run the tasks in a queue prepared by rqdata.prepare()
1702 """ 1703 """
1703 1704
1704 if self.rqdata.setscenewhitelist: 1705 if self.rqdata.setscenewhitelist and not self.rqdata.setscenewhitelist_checked:
1706 self.rqdata.setscenewhitelist_checked = True
1707
1705 # Check tasks that are going to run against the whitelist 1708 # Check tasks that are going to run against the whitelist
1706 def check_norun_task(tid, showerror=False): 1709 def check_norun_task(tid, showerror=False):
1707 (mc, fn, taskname, _) = split_tid_mcfn(tid) 1710 (mc, fn, taskname, _) = split_tid_mcfn(tid)