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: attach image file scan postfunc to do_image_complete

Browse Source 
The postfunc for finding image files after completion of a build
fails, as the image files we're interested in don't exist at the
point when the scan is currently done (following do_rootfs).

Attach the postfunc for scanning for image files to the new
do_image_complete task, which definitely runs after the image files
have been created.

[YOCTO #8956]

(From OE-Core rev: 9c597ef05cec12178d886f83a4cf7070f032ab2f)

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-02-02 10:25:02 +00:00
committed by Richard Purdie
parent 0c0b07286f
commit eee675bd71
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
meta/classes/toaster.bbclass
View File

@@ -159,7 +159,7 @@ python toaster_image_dumpdata() {
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("ImageFileSize", image_info_data), d)
}
python toaster_artifact_dumpdata() {
@@ -175,14 +175,12 @@ python toaster_artifact_dumpdata() {
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
artifact_info_data[artifact_path] = os.stat(artifact_path).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)
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
@@ -357,9 +355,11 @@ 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_image_complete[postfuncs] += "toaster_image_dumpdata "
do_image_complete[vardepsexclude] += "toaster_image_dumpdata "
do_rootfs[postfuncs] += "toaster_licensemanifest_dump "
do_rootfs[vardepsexclude] += "toaster_image_dumpdata toaster_licensemanifest_dump "
do_rootfs[vardepsexclude] += "toaster_licensemanifest_dump "
do_populate_sdk[postfuncs] += "toaster_artifact_dumpdata "
do_populate_sdk[vardepsexclude] += "toaster_artifact_dumpdata "