From 05e67417ca3174d1f9279f0de308a9d40933b461 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 17 Aug 2012 15:19:38 +0100 Subject: image.bbclass: Convert runtime_mapping_rename to event handler Signed-off-by: Richard Purdie --- meta/classes/image.bbclass | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 72720f1ffd..0f6ab381cd 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -111,13 +111,20 @@ python () { bb.fatal("%s contains conflicting IMAGE_FEATURES %s %s" % (d.getVar('PN', True), feature, ' '.join(list(temp)))) d.setVar('IMAGE_FEATURES', ' '.join(list(remain_features))) +} + +python image_handler () { + if not isinstance(e, bb.event.RecipeParsed): + return # If we don't do this we try and run the mapping hooks while parsing which is slow # bitbake should really provide something to let us know this... - if d.getVar('BB_WORKERCONTEXT', True) is not None: - runtime_mapping_rename("PACKAGE_INSTALL", d) - runtime_mapping_rename("PACKAGE_INSTALL_ATTEMPTONLY", d) + if e.data.getVar('BB_WORKERCONTEXT', True) is not None: + runtime_mapping_rename("PACKAGE_INSTALL", e.data) + runtime_mapping_rename("PACKAGE_INSTALL_ATTEMPTONLY", e.data) + } +addhandler image_handler # # Get a list of files containing device tables to create. -- cgit v1.2.3