summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-12-02 18:50:50 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-03 17:45:50 +0000
commitd51b3f375858cfcd3b2d90e53551f5705afa4eef (patch)
tree0a1905271197c5bf1d42d1f9dd97f1f4e84d5942 /meta
parentcdfef971d3596778b9f88e784379ee2fd56acbfa (diff)
downloadpoky-d51b3f375858cfcd3b2d90e53551f5705afa4eef.tar.gz
classes/buildhistory: reduce parsing time
Disable several python functions if not parsing within the worker context. This avoids executing expensive operations while parsing recipes (which is unnecessary). (Thanks to Richard Purdie for pointing out the issue and suggesting the workaround.) (From OE-Core rev: 540a2a30be21c3eca4323efbe91e7dcfc31a4c97) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/buildhistory.bbclass6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index b11e9bab5c..e46b124bbb 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -448,6 +448,8 @@ POPULATE_SDK_POST_HOST_COMMAND_append = "buildhistory_get_sdk_installed host ; "
448SDK_POSTPROCESS_COMMAND += "buildhistory_get_sdkinfo ; " 448SDK_POSTPROCESS_COMMAND += "buildhistory_get_sdkinfo ; "
449 449
450def buildhistory_get_layers(d): 450def buildhistory_get_layers(d):
451 if d.getVar('BB_WORKERCONTEXT', True) != '1':
452 return ""
451 layertext = "Configured metadata layers:\n%s\n" % '\n'.join(get_layers_branch_rev(d)) 453 layertext = "Configured metadata layers:\n%s\n" % '\n'.join(get_layers_branch_rev(d))
452 return layertext 454 return layertext
453 455
@@ -478,11 +480,15 @@ def outputvars(vars, listvars, d):
478 return ret.rstrip('\n') 480 return ret.rstrip('\n')
479 481
480def buildhistory_get_imagevars(d): 482def buildhistory_get_imagevars(d):
483 if d.getVar('BB_WORKERCONTEXT', True) != '1':
484 return ""
481 imagevars = "DISTRO DISTRO_VERSION USER_CLASSES IMAGE_CLASSES IMAGE_FEATURES IMAGE_LINGUAS IMAGE_INSTALL BAD_RECOMMENDATIONS NO_RECOMMENDATIONS PACKAGE_EXCLUDE ROOTFS_POSTPROCESS_COMMAND IMAGE_POSTPROCESS_COMMAND" 485 imagevars = "DISTRO DISTRO_VERSION USER_CLASSES IMAGE_CLASSES IMAGE_FEATURES IMAGE_LINGUAS IMAGE_INSTALL BAD_RECOMMENDATIONS NO_RECOMMENDATIONS PACKAGE_EXCLUDE ROOTFS_POSTPROCESS_COMMAND IMAGE_POSTPROCESS_COMMAND"
482 listvars = "USER_CLASSES IMAGE_CLASSES IMAGE_FEATURES IMAGE_LINGUAS IMAGE_INSTALL BAD_RECOMMENDATIONS PACKAGE_EXCLUDE" 486 listvars = "USER_CLASSES IMAGE_CLASSES IMAGE_FEATURES IMAGE_LINGUAS IMAGE_INSTALL BAD_RECOMMENDATIONS PACKAGE_EXCLUDE"
483 return outputvars(imagevars, listvars, d) 487 return outputvars(imagevars, listvars, d)
484 488
485def buildhistory_get_sdkvars(d): 489def buildhistory_get_sdkvars(d):
490 if d.getVar('BB_WORKERCONTEXT', True) != '1':
491 return ""
486 sdkvars = "DISTRO DISTRO_VERSION SDK_NAME SDK_VERSION SDKMACHINE SDKIMAGE_FEATURES BAD_RECOMMENDATIONS NO_RECOMMENDATIONS PACKAGE_EXCLUDE" 492 sdkvars = "DISTRO DISTRO_VERSION SDK_NAME SDK_VERSION SDKMACHINE SDKIMAGE_FEATURES BAD_RECOMMENDATIONS NO_RECOMMENDATIONS PACKAGE_EXCLUDE"
487 listvars = "SDKIMAGE_FEATURES BAD_RECOMMENDATIONS PACKAGE_EXCLUDE" 493 listvars = "SDKIMAGE_FEATURES BAD_RECOMMENDATIONS PACKAGE_EXCLUDE"
488 return outputvars(sdkvars, listvars, d) 494 return outputvars(sdkvars, listvars, d)