summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-22 16:43:06 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-23 09:24:31 +0100
commit4e1dc858fbf671ef27089a2b9bcdc965fe19d698 (patch)
treeb66f181ade5f472056d4f08a9976732ca93b3d2d /meta/lib
parent46a6da24b51426bedd9af8a2d63b2992b9d3fa5a (diff)
downloadopenembedded-core-contrib-4e1dc858fbf671ef27089a2b9bcdc965fe19d698.tar.gz
openembedded-core-contrib-4e1dc858fbf671ef27089a2b9bcdc965fe19d698.tar.bz2
openembedded-core-contrib-4e1dc858fbf671ef27089a2b9bcdc965fe19d698.zip
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@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/utils.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index 814ac0fd51..f22a6ab596 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)