summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-20 17:08:40 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-04 12:57:43 (GMT)
commit41ea1be73c1945403440a0e38a156227702d415f (patch)
tree65278d415ca4bce80f3042e2fbe5298e6389f05d
parent3ab224951c3210e8a5a3a1f5995372b0f2501163 (diff)
downloadpoky-41ea1be73c1945403440a0e38a156227702d415f.tar.gz
utils: Make get_multilib_datastore available from lib/oe
Currently we can't access this function from lib/oe as its a class function. Move it to allow such access. (From OE-Core rev: b241a666f2867ffa425f6d43763d7c3c17941dcf) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/utils.bbclass7
-rw-r--r--meta/lib/oe/utils.py8
2 files changed, 9 insertions, 6 deletions
diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass
index 8e07eac..32cae7e 100644
--- a/meta/classes/utils.bbclass
+++ b/meta/classes/utils.bbclass
@@ -364,12 +364,7 @@ def multilib_pkg_extend(d, pkg):
364 return pkgs 364 return pkgs
365 365
366def get_multilib_datastore(variant, d): 366def get_multilib_datastore(variant, d):
367 localdata = bb.data.createCopy(d) 367 return oe.utils.get_multilib_datastore(variant, d)
368 overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + variant
369 localdata.setVar("OVERRIDES", overrides)
370 localdata.setVar("MLPREFIX", variant + "-")
371 return localdata
372get_multilib_datastore[vardepsexclude] = "OVERRIDES"
373 368
374def all_multilib_tune_values(d, var, unique = True, need_split = True, delim = ' '): 369def all_multilib_tune_values(d, var, unique = True, need_split = True, delim = ' '):
375 """Return a string of all ${var} in all multilib tune configuration""" 370 """Return a string of all ${var} in all multilib tune configuration"""
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index 1897c5f..7a79d75 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -281,6 +281,14 @@ def host_gcc_version(d):
281 version = match.group(1) 281 version = match.group(1)
282 return "-%s" % version if version in ("4.8", "4.9") else "" 282 return "-%s" % version if version in ("4.8", "4.9") else ""
283 283
284
285def get_multilib_datastore(variant, d):
286 localdata = bb.data.createCopy(d)
287 overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + variant
288 localdata.setVar("OVERRIDES", overrides)
289 localdata.setVar("MLPREFIX", variant + "-")
290 return localdata
291
284# 292#
285# Python 2.7 doesn't have threaded pools (just multiprocessing) 293# Python 2.7 doesn't have threaded pools (just multiprocessing)
286# so implement a version here 294# so implement a version here