aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-22 17:01:16 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-23 09:24:31 +0100
commit2ae85af480066e252fca01f3005ecac2ff37a8d4 (patch)
tree357e05782c892c4cb40969f91f02063d97e3a08a
parent774219567987956fb7bbb50e64eb6cebef1efe5b (diff)
downloadopenembedded-core-contrib-2ae85af480066e252fca01f3005ecac2ff37a8d4.tar.gz
openembedded-core-contrib-2ae85af480066e252fca01f3005ecac2ff37a8d4.tar.bz2
openembedded-core-contrib-2ae85af480066e252fca01f3005ecac2ff37a8d4.zip
utils: Rely on get_multilib_datastore() to get the original datastore
get_multilib_datastore() should be able to handle the original datastore correctly now so rely upon this rather than custom coding. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/utils.bbclass16
1 files changed, 1 insertions, 15 deletions
diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass
index 7035f9da25..812129fda7 100644
--- a/meta/classes/utils.bbclass
+++ b/meta/classes/utils.bbclass
@@ -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))