summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe/utils.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-22 16:43:06 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-23 16:58:59 (GMT)
commit5875571f03edcff9c32daa821f4a2be04ff272a3 (patch)
treebb801901c0ba676fa106b526950521563892fb6f /meta/lib/oe/utils.py
parent14dfb7ea59e61cef998ff6eed367e057847d2aca (diff)
downloadpoky-5875571f03edcff9c32daa821f4a2be04ff272a3.tar.gz
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. (From OE-Core rev: 4e1dc858fbf671ef27089a2b9bcdc965fe19d698) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/utils.py')
-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 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):
368 localdata.setVar("OVERRIDES", overrides) 368 localdata.setVar("OVERRIDES", overrides)
369 localdata.setVar("MLPREFIX", variant + "-") 369 localdata.setVar("MLPREFIX", variant + "-")
370 else: 370 else:
371 origdefault = localdata.getVar("DEFAULTTUNE_MULTILIB_ORIGINAL")
372 if origdefault:
373 localdata.setVar("DEFAULTTUNE", origdefault)
371 overrides = localdata.getVar("OVERRIDES", False).split(":") 374 overrides = localdata.getVar("OVERRIDES", False).split(":")
372 overrides = ":".join([x for x in overrides if not x.startswith("virtclass-multilib-")]) 375 overrides = ":".join([x for x in overrides if not x.startswith("virtclass-multilib-")])
373 localdata.setVar("OVERRIDES", overrides) 376 localdata.setVar("OVERRIDES", overrides)