summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe/utils.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-02 09:03:12 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-02 20:37:47 (GMT)
commite9e1107c6133c5363cf2849339697bc4dad2b2e3 (patch)
tree9c80b4961b35f0c2174d6cb1112801608ba4c1f7 /meta/lib/oe/utils.py
parent9086a55d25c4c45ae3be3a4239a487f2df1a2e98 (diff)
downloadpoky-e9e1107c6133c5363cf2849339697bc4dad2b2e3.tar.gz
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. (From OE-Core rev: 295c5a3d19834a2fac255346d0a373449cfdd776) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/utils.py')
-rw-r--r--meta/lib/oe/utils.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index 80f0442..6aed6dc 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -327,9 +327,15 @@ def host_gcc_version(d):
327 327
328def get_multilib_datastore(variant, d): 328def get_multilib_datastore(variant, d):
329 localdata = bb.data.createCopy(d) 329 localdata = bb.data.createCopy(d)
330 overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + variant 330 if variant:
331 localdata.setVar("OVERRIDES", overrides) 331 overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + variant
332 localdata.setVar("MLPREFIX", variant + "-") 332 localdata.setVar("OVERRIDES", overrides)
333 localdata.setVar("MLPREFIX", variant + "-")
334 else:
335 overrides = localdata.getVar("OVERRIDES", False).split(":")
336 overrides = ":".join([x for x in overrides if not x.startswith("virtclass-multilib-")])
337 localdata.setVar("OVERRIDES", overrides)
338 localdata.setVar("MLPREFIX", "")
333 return localdata 339 return localdata
334 340
335# 341#