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 <rpurdie@linux.intel.com>

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index e4e8900f98136237790c89f3bdddab56ee98685b..4a5b83e30b31ac161276dad96119a0c6b49f1606 100644 (file)
--- 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)
 }
 
 #