From 9c597ef05cec12178d886f83a4cf7070f032ab2f Mon Sep 17 00:00:00 2001 From: Elliot Smith Date: Tue, 2 Feb 2016 10:25:02 +0000 Subject: toaster.bbclass: attach image file scan postfunc to do_image_complete 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] Signed-off-by: Elliot Smith Signed-off-by: Richard Purdie --- meta/classes/toaster.bbclass | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'meta/classes/toaster.bbclass') diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass index fba9067f0a..e307014a6a 100644 --- a/meta/classes/toaster.bbclass +++ b/meta/classes/toaster.bbclass @@ -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 " -- cgit 1.2.3-korg