From 0f77f3fa44c872a5ec61676d74168d9d8284d12c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 26 Mar 2014 09:30:33 +0000 Subject: base.bbclass: Run oe_import before other INHERITs Its possible for classes listed in INHERIT directives to use things like the oe.utils functions. If that happens the user sees a traceback since the modules don't become available until the ConfigParsed event. This change to use immediate expansion means that the oe modules become available much sooner and can be used in the core classes, including within base.bbclass. (From OE-Core rev: a9ecad713f37f2703e99c6b856207abeb6c5ad1f) Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 76a4ef650d..7c39db9157 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -31,8 +31,12 @@ def oe_import(d): imported = __import__(toimport) inject(toimport.split(".", 1)[0], imported) + return "" + +# We need the oe module name space early (before INHERITs get added) +OE_IMPORTED := "${@oe_import(d)}" + python oe_import_eh () { - oe_import(e.data) e.data.setVar("NATIVELSBSTRING", lsb_distro_identifier(e.data)) } -- cgit v1.2.3-54-g00ecf