From 1f35b05d60f4e84554c5ee837cb071815e12c91c Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Tue, 19 Apr 2016 14:17:04 +0300 Subject: license.bbclass: do write_deploy_manifest in image postprocessing Call write_deploy_manifest() in image postprocessing phase, instead of rootfs postprocessing. The reason being that not necessarily all do_deploy tasks are dependencies of the do_rootfs and we might miss something. [YOCTO #9446] Signed-off-by: Markus Lehtonen Signed-off-by: Richard Purdie --- meta/classes/license.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 94be559f44..43944e6ee6 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -650,9 +650,12 @@ SSTATETASKS += "do_populate_lic" do_populate_lic[sstate-inputdirs] = "${LICSSTATEDIR}" do_populate_lic[sstate-outputdirs] = "${LICENSE_DIRECTORY}/" -ROOTFS_POSTPROCESS_COMMAND_prepend = "write_package_manifest; write_deploy_manifest; license_create_manifest; " +ROOTFS_POSTPROCESS_COMMAND_prepend = "write_package_manifest; license_create_manifest; " do_rootfs[recrdeptask] += "do_populate_lic" +IMAGE_POSTPROCESS_COMMAND_prepend = "write_deploy_manifest; " +do_image[recrdeptask] += "do_populate_lic" + do_populate_lic_setscene[dirs] = "${LICSSTATEDIR}/${PN}" do_populate_lic_setscene[cleandirs] = "${LICSSTATEDIR}" python do_populate_lic_setscene () { -- cgit 1.2.3-korg