From 295c5a3d19834a2fac255346d0a373449cfdd776 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 2 Jul 2018 09:03:12 +0000 Subject: lib/oe/utils: Improve get_multilib_datastore Currently this function assumes that no multilib is applied and that we're applying a multilib. This means if we're in multilib context and want the non-multilib context we can't obtain it (and no other function exists for this either). Improve the function to allow this to be requested. Signed-off-by: Richard Purdie --- meta/lib/oe/utils.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'meta/lib/oe/utils.py') diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index 80f0442d0a..6aed6dc993 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py @@ -327,9 +327,15 @@ def host_gcc_version(d): def get_multilib_datastore(variant, d): localdata = bb.data.createCopy(d) - overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + variant - localdata.setVar("OVERRIDES", overrides) - localdata.setVar("MLPREFIX", variant + "-") + if variant: + overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + variant + localdata.setVar("OVERRIDES", overrides) + localdata.setVar("MLPREFIX", variant + "-") + else: + overrides = localdata.getVar("OVERRIDES", False).split(":") + overrides = ":".join([x for x in overrides if not x.startswith("virtclass-multilib-")]) + localdata.setVar("OVERRIDES", overrides) + localdata.setVar("MLPREFIX", "") return localdata # -- cgit 1.2.3-korg