[oe-commits] [openembedded-core] 10/13: lib/oe/utils: Improve get_multilib_datastore

[git at git.openembedded.org]

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 096b74c0bb220ad015c18a59211bba33ef2f1d5a
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Mon Jul 2 09:03:12 2018 +0000

    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 <richard.purdie at linuxfoundation.org>
---
 meta/lib/oe/utils.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index 80f0442..b569831 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -327,9 +327,16 @@ 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-")])
+        bb.warn(str(overrides))
+        localdata.setVar("OVERRIDES", overrides)
+        localdata.setVar("MLPREFIX", "")
     return localdata
 
 #

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.