diff options
| -rw-r--r-- | meta/classes/base.bbclass | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index b552de2948..51f5a14a45 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -10,32 +10,28 @@ inherit metadata_scm inherit buildstats inherit logging -python sys_path_eh () { +OE_IMPORTS += "os sys time oe.path oe.utils oe.data" + +python oe_import () { if isinstance(e, bb.event.ConfigParsed): - import sys - import os - import time + import os, sys bbpath = e.data.getVar("BBPATH", True).split(":") sys.path[0:0] = [os.path.join(dir, "lib") for dir in bbpath] def inject(name, value): - """Make a python object accessible from everywhere for the metadata""" + """Make a python object accessible from the metadata""" if hasattr(bb.utils, "_context"): bb.utils._context[name] = value else: __builtins__[name] = value - import oe.path - import oe.utils - import oe.data - inject("bb", bb) - inject("sys", sys) - inject("time", time) - inject("oe", oe) + for toimport in e.data.getVar("OE_IMPORTS", True).split(): + imported = __import__(toimport) + inject(toimport.split(".", 1)[0], imported) } -addhandler sys_path_eh +addhandler oe_import die() { bbfatal "$*" |