mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 21:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: runqueue: Don't use sys.argv

Browse Source 
We should not be using sys.argv inside the server to decide which targets
the user added on the commandline. There might not even be a commandline.

Thankfully the targets variable is easily accessible in this context
and contains this exact data we want.

(Bitbake rev: 5b12bf30bccdd00262e74964223220c649040be4)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2020-08-24 22:24:30 +01:00
parent 7002d67de0
commit 8ce3e9a76d
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bitbake/lib/bb/runqueue.py
View File

@@ -376,7 +376,7 @@ class RunQueueData:
self.stampwhitelist = cfgData.getVar("BB_STAMP_WHITELIST") or "" self.stampwhitelist = cfgData.getVar("BB_STAMP_WHITELIST") or ""
self.multi_provider_whitelist = (cfgData.getVar("MULTI_PROVIDER_WHITELIST") or "").split() self.multi_provider_whitelist = (cfgData.getVar("MULTI_PROVIDER_WHITELIST") or "").split()
self.setscenewhitelist = get_setscene_enforce_whitelist(cfgData) self.setscenewhitelist = get_setscene_enforce_whitelist(cfgData, targets)
self.setscenewhitelist_checked = False self.setscenewhitelist_checked = False
self.setscene_enforce = (cfgData.getVar('BB_SETSCENE_ENFORCE') == "1") self.setscene_enforce = (cfgData.getVar('BB_SETSCENE_ENFORCE') == "1")
self.init_progress_reporter = bb.progress.DummyMultiStageProcessProgressReporter() self.init_progress_reporter = bb.progress.DummyMultiStageProcessProgressReporter()
@@ -2999,16 +2999,15 @@ class runQueuePipe():
print("Warning, worker left partial message: %s" % self.queue) print("Warning, worker left partial message: %s" % self.queue)
self.input.close() self.input.close()
def get_setscene_enforce_whitelist(d): def get_setscene_enforce_whitelist(d, targets):
if d.getVar('BB_SETSCENE_ENFORCE') != '1': if d.getVar('BB_SETSCENE_ENFORCE') != '1':
return None return None
whitelist = (d.getVar("BB_SETSCENE_ENFORCE_WHITELIST") or "").split() whitelist = (d.getVar("BB_SETSCENE_ENFORCE_WHITELIST") or "").split()
outlist = [] outlist = []
for item in whitelist[:]: for item in whitelist[:]:
if item.startswith('%:'): if item.startswith('%:'):
for target in sys.argv[1:]: for (mc, target, task, fn) in targets:
if not target.startswith('-'): outlist.append(target + ':' + item.split(':')[1])
outlist.append(target.split(':')[0] + ':' + item.split(':')[1])
else: else:
outlist.append(item) outlist.append(item)
return outlist return outlist