summaryrefslogtreecommitdiffstats
path: root/meta/classes/buildhistory.bbclass
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2014-07-25 15:15:38 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-18 21:47:58 +0100
commit3223a704f9185e4a828f982b00b653becf0f548b (patch)
treeb11eeb5bdb543f73b945a9986c13552df61ee0e6 /meta/classes/buildhistory.bbclass
parent858846df3c14eda21af3e2b158b52f2fea0115ec (diff)
downloadpoky-3223a704f9185e4a828f982b00b653becf0f548b.tar.gz
buildhistory: rename build-id to build-id.txt and add more info
* use .txt extension like other reports (e.g. image-info.txt) it's also useful when looking at the file from web server which doesn't have text/plain as default content-type * include whole BUILDCFG_HEADER/BUILDCFG_FUNCS instead of just layer info * this makes it easier for distro to include more fields without the need to modify buildhistory.bbclass * currently it adds following fields: Build Configuration: BB_VERSION = "1.23.1" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "Gentoo-2.2" TARGET_SYS = "x86_64-oe-linux" MACHINE = "qemux86-64" DISTRO = "shr" DISTRO_VERSION = "2013.07-next-20140725" TUNE_FEATURES = "m64 core2" TARGET_FPU = "" (From OE-Core rev: 6db6c74f2876df7a183990426bb4262972966441) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/buildhistory.bbclass')
-rw-r--r--meta/classes/buildhistory.bbclass26
1 files changed, 18 insertions, 8 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 20382ce410..479e460c23 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -461,10 +461,10 @@ END
461 echo "IMAGESIZE = $imagesize" >> ${BUILDHISTORY_DIR_IMAGE}/image-info.txt 461 echo "IMAGESIZE = $imagesize" >> ${BUILDHISTORY_DIR_IMAGE}/image-info.txt
462 462
463 # Add some configuration information 463 # Add some configuration information
464 echo "${MACHINE}: ${IMAGE_BASENAME} configured for ${DISTRO} ${DISTRO_VERSION}" > ${BUILDHISTORY_DIR_IMAGE}/build-id 464 echo "${MACHINE}: ${IMAGE_BASENAME} configured for ${DISTRO} ${DISTRO_VERSION}" > ${BUILDHISTORY_DIR_IMAGE}/build-id.txt
465 465
466 cat >> ${BUILDHISTORY_DIR_IMAGE}/build-id <<END 466 cat >> ${BUILDHISTORY_DIR_IMAGE}/build-id.txt <<END
467${@buildhistory_get_layers(d)} 467${@buildhistory_get_build_id(d)}
468END 468END
469} 469}
470 470
@@ -498,11 +498,21 @@ POPULATE_SDK_POST_HOST_COMMAND_append = " buildhistory_list_installed_sdk_host ;
498 498
499SDK_POSTPROCESS_COMMAND += "buildhistory_get_sdkinfo ; " 499SDK_POSTPROCESS_COMMAND += "buildhistory_get_sdkinfo ; "
500 500
501def buildhistory_get_layers(d): 501def buildhistory_get_build_id(d):
502 if d.getVar('BB_WORKERCONTEXT', True) != '1': 502 localdata = bb.data.createCopy(d)
503 return "" 503 bb.data.update_data(localdata)
504 layertext = "Configured metadata layers:\n%s\n" % '\n'.join(get_layers_branch_rev(d)) 504 statuslines = []
505 return layertext 505 for func in oe.data.typed_value('BUILDCFG_FUNCS', localdata):
506 g = globals()
507 if func not in g:
508 bb.warn("Build configuration function '%s' does not exist" % func)
509 else:
510 flines = g[func](localdata)
511 if flines:
512 statuslines.extend(flines)
513
514 statusheader = d.getVar('BUILDCFG_HEADER', True)
515 return('\n%s\n%s\n' % (statusheader, '\n'.join(statuslines)))
506 516
507def buildhistory_get_metadata_revs(d): 517def buildhistory_get_metadata_revs(d):
508 # We want an easily machine-readable format here, so get_layers_branch_rev isn't quite what we want 518 # We want an easily machine-readable format here, so get_layers_branch_rev isn't quite what we want