[oe-commits] [openembedded-core] 06/08: lib/oe/utils: Fix get_multilib_datastore to work for original tune

[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 4a7bf62a996b743b7c167f78c3d30e52b6858ffd
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Wed Aug 22 16:43:06 2018 +0000

    lib/oe/utils: Fix get_multilib_datastore to work for original tune
    
    Currently the original datastore returned by this function doesn't
    always work as the tune isn't set back to the original. Fix it
    to work like all_multilib_tune_list() in utils.bbclass and correct
    the data returned.
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/lib/oe/utils.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index 814ac0f..f22a6ab 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -368,6 +368,9 @@ def get_multilib_datastore(variant, d):
         localdata.setVar("OVERRIDES", overrides)
         localdata.setVar("MLPREFIX", variant + "-")
     else:
+        origdefault = localdata.getVar("DEFAULTTUNE_MULTILIB_ORIGINAL")
+        if origdefault:
+            localdata.setVar("DEFAULTTUNE", origdefault)
         overrides = localdata.getVar("OVERRIDES", False).split(":")
         overrides = ":".join([x for x in overrides if not x.startswith("virtclass-multilib-")])
         localdata.setVar("OVERRIDES", overrides)

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