summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2016-04-19 14:17:04 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-19 14:46:37 +0100
commit1f35b05d60f4e84554c5ee837cb071815e12c91c (patch)
tree3a379678d6f798c24708c240ed62e1961f60b0f4
parent14ff58ad98a5afac08db77068d80f152d8875766 (diff)
downloadopenembedded-core-contrib-1f35b05d60f4e84554c5ee837cb071815e12c91c.tar.gz
openembedded-core-contrib-1f35b05d60f4e84554c5ee837cb071815e12c91c.tar.bz2
openembedded-core-contrib-1f35b05d60f4e84554c5ee837cb071815e12c91c.zip
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 <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/license.bbclass5
1 files changed, 4 insertions, 1 deletions
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 () {