From 2ae85af480066e252fca01f3005ecac2ff37a8d4 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 22 Aug 2018 17:01:16 +0000 Subject: 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 --- meta/classes/utils.bbclass | 16 +--------------- 1 file changed, 1 insertion(+), 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)) -- cgit 1.2.3-korg