From d5301d008a5cc02a08d660691fce2c18ed8028d7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 31 Mar 2022 12:01:51 +0100 Subject: [PATCH] base: Clean up module import compatibility code This code was for old versions of bitbake which we're now long past. Drop it and simplify the code. Signed-off-by: Richard Purdie Signed-off-by: Alexandre Belloni --- meta/classes/base.bbclass | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index e51722d945d..3515720bf95 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -23,18 +23,11 @@ def oe_import(d): 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] - 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 - 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 "" -- 2.47.2