From 5875571f03edcff9c32daa821f4a2be04ff272a3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 22 Aug 2018 16:43:06 +0000 Subject: 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 --- meta/lib/oe/utils.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta/lib/oe') 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) -- cgit v1.2.3-54-g00ecf