mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

toaster.bbclass: Separate artifact dump from image file dump

Browse Source 
SDK artifacts were being dumped alongside the image file dump.
However, the dump was not being triggered correctly, as it
should be attached as a postfunc to do_populate_sdk, rather than
do_rootfs, as do_rootfs doesn't always fire when populating
the SDK directory.

By adding a postfunc to do_populate_sdk, the postfunc is fired
in the correct situations.

Also fixes the directory which is scanned for SDK artifacts, as
this is different from the image file directory.

[YOCTO #7603]

(From OE-Core rev: cd2eb45ce1f9be15e133d6fe940c1cff2199099b)

Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Elliot Smith
2016-01-13 08:55:36 +00:00
committed by Richard Purdie
parent 4f481bcfaa
commit e246905bfc
1 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
meta/classes/toaster.bbclass
View File

@@ -147,31 +147,43 @@ python toaster_image_dumpdata() {
deploy_dir_image = d.getVar('DEPLOY_DIR_IMAGE', True);
image_name = d.getVar('IMAGE_NAME', True);
image_info_data = {}
artifact_info_data = {}
# collect all artifacts
# collect all images
for dirpath, dirnames, filenames in os.walk(deploy_dir_image):
for fn in filenames:
try:
if fn.startswith(image_name):
image_output = os.path.join(dirpath, fn)
image_info_data[image_output] = os.stat(image_output).st_size
else:
import stat
artifact_path = os.path.join(dirpath, fn)
filestat = os.stat(artifact_path)
if not os.path.islink(artifact_path):
artifact_info_data[artifact_path] = filestat.st_size
except OSError as e:
bb.event.fire(bb.event.MetadataEvent("OSErrorException", e), d)
bb.event.fire(bb.event.MetadataEvent("ImageFileSize",image_info_data), d)
bb.event.fire(bb.event.MetadataEvent("ArtifactFileSize",artifact_info_data), d)
}
python toaster_artifact_dumpdata() {
"""
Dump data about artifacts in the SDK_DEPLOY directory
"""
artifact_dir = d.getVar("SDK_DEPLOY", True)
artifact_info_data = {}
# collect all artifacts
for dirpath, dirnames, filenames in os.walk(artifact_dir):
for fn in filenames:
try:
artifact_path = os.path.join(dirpath, fn)
filestat = os.stat(artifact_path)
if not os.path.islink(artifact_path):
artifact_info_data[artifact_path] = filestat.st_size
except OSError as e:
import sys
bb.event.fire(bb.event.MetadataEvent("OSErrorException", e), d)
bb.event.fire(bb.event.MetadataEvent("ArtifactFileSize",artifact_info_data), d)
}
# collect list of buildstats files based on fired events; when the build completes, collect all stats and fire an event with collected data
@@ -341,9 +353,13 @@ toaster_collect_task_stats[eventmask] = "bb.event.BuildCompleted bb.build.TaskSu
addhandler toaster_buildhistory_dump
toaster_buildhistory_dump[eventmask] = "bb.event.BuildCompleted"
do_package[postfuncs] += "toaster_package_dumpdata "
do_package[vardepsexclude] += "toaster_package_dumpdata "
do_rootfs[postfuncs] += "toaster_image_dumpdata "
do_rootfs[postfuncs] += "toaster_licensemanifest_dump "
do_rootfs[vardepsexclude] += "toaster_image_dumpdata toaster_licensemanifest_dump"
do_rootfs[vardepsexclude] += "toaster_image_dumpdata toaster_licensemanifest_dump "
do_populate_sdk[postfuncs] += "toaster_artifact_dumpdata "
do_populate_sdk[vardepsexclude] += "toaster_artifact_dumpdata "