浏览代码

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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Richard Purdie 6 年之前
父节点
当前提交
b241a666f2
共有 2 个文件被更改,包括 9 次插入6 次删除
  1. 1 6
      meta/classes/utils.bbclass
  2. 8 0
      meta/lib/oe/utils.py

+ 1 - 6
meta/classes/utils.bbclass

@@ -364,12 +364,7 @@ def multilib_pkg_extend(d, pkg):
     return pkgs
 
 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 + "-")
-    return localdata
-get_multilib_datastore[vardepsexclude] = "OVERRIDES"
+    return oe.utils.get_multilib_datastore(variant, d)
 
 def all_multilib_tune_values(d, var, unique = True, need_split = True, delim = ' '):
     """Return a string of all ${var} in all multilib tune configuration"""

+ 8 - 0
meta/lib/oe/utils.py

@@ -281,6 +281,14 @@ def host_gcc_version(d):
     version = match.group(1)
     return "-%s" % version if version in ("4.8", "4.9") else ""
 
+
+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 + "-")
+    return localdata
+
 #
 # Python 2.7 doesn't have threaded pools (just multiprocessing)
 # so implement a version here