diff options
Diffstat (limited to 'poky/meta/classes/base.bbclass')
| -rw-r--r-- | poky/meta/classes/base.bbclass | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/poky/meta/classes/base.bbclass b/poky/meta/classes/base.bbclass index cc81461473..3515720bf9 100644 --- a/poky/meta/classes/base.bbclass +++ b/poky/meta/classes/base.bbclass @@ -20,21 +20,14 @@ PACKAGECONFIG_CONFARGS ??= "" def oe_import(d): import sys - bbpath = d.getVar("BBPATH").split(":") - sys.path[0:0] = [os.path.join(dir, "lib") for dir in bbpath] - - def inject(name, value): - """Make a python object accessible from the metadata""" - if hasattr(bb.utils, "_context"): - bb.utils._context[name] = value - else: - __builtins__[name] = value + bbpath = [os.path.join(dir, "lib") for dir in d.getVar("BBPATH").split(":")] + sys.path[0:0] = [dir for dir in bbpath if dir not in sys.path] import oe.data for toimport in oe.data.typed_value("OE_IMPORTS", d): try: - imported = __import__(toimport) - inject(toimport.split(".", 1)[0], imported) + # Make a python object accessible from the metadata + bb.utils._context[toimport.split(".", 1)[0]] = __import__(toimport) except AttributeError as e: bb.error("Error importing OE modules: %s" % str(e)) return "" |