[oe-commits] [openembedded-core] 06/21: utils: Rely on get_multilib_datastore() to get the original datastore
git at git.openembedded.org
git at git.openembedded.org
Thu Aug 23 08:13:36 UTC 2018
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit e439d6289e9926c4d5e85ca6f0fa3da0ba850f84
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Wed Aug 22 17:01:16 2018 +0000
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 at linuxfoundation.org>
---
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 7035f9d..812129f 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))
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list