From: Richard Purdie Date: Fri, 2 Jul 2010 13:34:14 +0000 (+0100) Subject: image.bbclass: Don't perform mapping renaming until we're running the task itself. X-Git-Tag: 2011-1~5593 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=4e0ee648b4c18b770aba11921370258f3e2aaeef;p=openembedded-core.git image.bbclass: Don't perform mapping renaming until we're running the task itself. Need to extend bitbake to provide this information rather than refer to a bitbake internal variable. Signed-off-by: Richard Purdie --- diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index e4e8900f98..4a5b83e30b 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -34,8 +34,11 @@ python () { deps += " %s:do_populate_sysroot" % dep bb.data.setVarFlag('do_rootfs', 'depends', deps, d) - runtime_mapping_rename("PACKAGE_INSTALL", d) - runtime_mapping_rename("PACKAGE_INSTALL_ATTEMPTONLY", d) + # 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 bb.data.getVar('__RUNQUEUE_DO_NOT_USE_EXTERNALLY', d, True) is not None: + runtime_mapping_rename("PACKAGE_INSTALL", d) + runtime_mapping_rename("PACKAGE_INSTALL_ATTEMPTONLY", d) } #