diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-02 09:03:12 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-02 17:13:19 +0100 |
| commit | 295c5a3d19834a2fac255346d0a373449cfdd776 (patch) | |
| tree | ef230adefbd0bb9a89de667511e328e04e4d99d9 /meta/lib/oe/utils.py | |
| parent | 828462d2c39fe6f4d188b5eb129f7b2969e1ee18 (diff) | |
| download | openembedded-core-295c5a3d19834a2fac255346d0a373449cfdd776.tar.gz openembedded-core-295c5a3d19834a2fac255346d0a373449cfdd776.tar.bz2 openembedded-core-295c5a3d19834a2fac255346d0a373449cfdd776.zip | |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/utils.py')
| -rw-r--r-- | meta/lib/oe/utils.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index 80f0442d0a..6aed6dc993 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py @@ -327,9 +327,15 @@ def host_gcc_version(d): def get_multilib_datastore(variant, d): localdata = bb.data.createCopy(d) - overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + variant - localdata.setVar("OVERRIDES", overrides) - localdata.setVar("MLPREFIX", variant + "-") + if variant: + overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + variant + localdata.setVar("OVERRIDES", overrides) + localdata.setVar("MLPREFIX", variant + "-") + else: + overrides = localdata.getVar("OVERRIDES", False).split(":") + overrides = ":".join([x for x in overrides if not x.startswith("virtclass-multilib-")]) + localdata.setVar("OVERRIDES", overrides) + localdata.setVar("MLPREFIX", "") return localdata # |