summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/runqueue.py
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
-rw-r--r--bitbake/lib/bb/runqueue.py23
1 files changed, 1 insertions, 22 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 957c2d1806..8ae3fe85f1 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -385,7 +385,6 @@ class RunQueueData:
385 self.rq = rq 385 self.rq = rq
386 self.warn_multi_bb = False 386 self.warn_multi_bb = False
387 387
388 self.stampwhitelist = cfgData.getVar("BB_STAMP_WHITELIST") or ""
389 self.multi_provider_whitelist = (cfgData.getVar("MULTI_PROVIDER_WHITELIST") or "").split() 388 self.multi_provider_whitelist = (cfgData.getVar("MULTI_PROVIDER_WHITELIST") or "").split()
390 self.setscenewhitelist = get_setscene_enforce_whitelist(cfgData, targets) 389 self.setscenewhitelist = get_setscene_enforce_whitelist(cfgData, targets)
391 self.setscenewhitelist_checked = False 390 self.setscenewhitelist_checked = False
@@ -1128,17 +1127,6 @@ class RunQueueData:
1128 logger.error("".join(msgs)) 1127 logger.error("".join(msgs))
1129 1128
1130 self.init_progress_reporter.next_stage() 1129 self.init_progress_reporter.next_stage()
1131
1132 # Create a whitelist usable by the stamp checks
1133 self.stampfnwhitelist = {}
1134 for mc in self.taskData:
1135 self.stampfnwhitelist[mc] = []
1136 for entry in self.stampwhitelist.split():
1137 if entry not in self.taskData[mc].build_targets:
1138 continue
1139 fn = self.taskData.build_targets[entry][0]
1140 self.stampfnwhitelist[mc].append(fn)
1141
1142 self.init_progress_reporter.next_stage() 1130 self.init_progress_reporter.next_stage()
1143 1131
1144 # Iterate over the task list looking for tasks with a 'setscene' function 1132 # Iterate over the task list looking for tasks with a 'setscene' function
@@ -1227,7 +1215,6 @@ class RunQueue:
1227 self.cfgData = cfgData 1215 self.cfgData = cfgData
1228 self.rqdata = RunQueueData(self, cooker, cfgData, dataCaches, taskData, targets) 1216 self.rqdata = RunQueueData(self, cooker, cfgData, dataCaches, taskData, targets)
1229 1217
1230 self.stamppolicy = cfgData.getVar("BB_STAMP_POLICY") or "perfile"
1231 self.hashvalidate = cfgData.getVar("BB_HASHCHECK_FUNCTION") or None 1218 self.hashvalidate = cfgData.getVar("BB_HASHCHECK_FUNCTION") or None
1232 self.depvalidate = cfgData.getVar("BB_SETSCENE_DEPVALID") or None 1219 self.depvalidate = cfgData.getVar("BB_SETSCENE_DEPVALID") or None
1233 1220
@@ -1356,14 +1343,6 @@ class RunQueue:
1356 if taskname is None: 1343 if taskname is None:
1357 taskname = tn 1344 taskname = tn
1358 1345
1359 if self.stamppolicy == "perfile":
1360 fulldeptree = False
1361 else:
1362 fulldeptree = True
1363 stampwhitelist = []
1364 if self.stamppolicy == "whitelist":
1365 stampwhitelist = self.rqdata.stampfnwhitelist[mc]
1366
1367 stampfile = bb.build.stampfile(taskname, self.rqdata.dataCaches[mc], taskfn) 1346 stampfile = bb.build.stampfile(taskname, self.rqdata.dataCaches[mc], taskfn)
1368 1347
1369 # If the stamp is missing, it's not current 1348 # If the stamp is missing, it's not current
@@ -1395,7 +1374,7 @@ class RunQueue:
1395 continue 1374 continue
1396 if t3 and t3 > t2: 1375 if t3 and t3 > t2:
1397 continue 1376 continue
1398 if fn == fn2 or (fulldeptree and fn2 not in stampwhitelist): 1377 if fn == fn2:
1399 if not t2: 1378 if not t2:
1400 logger.debug2('Stampfile %s does not exist', stampfile2) 1379 logger.debug2('Stampfile %s does not exist', stampfile2)
1401 iscurrent = False 1380 iscurrent = False