mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-21 12:32:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

utils: Rely on get_multilib_datastore() to get the original datastore

Browse Source 
get_multilib_datastore() should be able to handle the original datastore
correctly now so rely upon this rather than custom coding.

(From OE-Core rev: 2ae85af480066e252fca01f3005ecac2ff37a8d4)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2018-08-22 17:01:16 +00:00
parent 2988d730a3
commit 99d40ac092
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
meta/classes/utils.bbclass
View File

@@ -361,21 +361,7 @@ def all_multilib_tune_list(vars, d):
for v in vars:
values[v] = []
localdata = bb.data.createCopy(d)
overrides = localdata.getVar("OVERRIDES", False).split(":")
newoverrides = []
for o in overrides:
if not o.startswith("virtclass-multilib-"):
newoverrides.append(o)
localdata.setVar("OVERRIDES", ":".join(newoverrides))
localdata.setVar("MLPREFIX", "")
origdefault = localdata.getVar("DEFAULTTUNE_MULTILIB_ORIGINAL")
if origdefault:
localdata.setVar("DEFAULTTUNE", origdefault)
values['ml'] = ['']
for v in vars:
values[v].append(localdata.getVar(v))
variants = d.getVar("MULTILIB_VARIANTS") or ""
variants = (d.getVar("MULTILIB_VARIANTS") or "").split() + ['']
for item in variants.split():
localdata = get_multilib_datastore(item, d)
values[v].append(localdata.getVar(v))