summaryrefslogtreecommitdiffstats
path: root/meta/classes
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 21:11:24 +0100
commit98bf7dea84bb6ef960ff6e8755476f50779ee35c (patch)
treeeb261ab4945b4385dc759f1f76f6a7cc25dbdc0f /meta/classes
parent519600c607ba0f1da7b915160aff49fc63b3ca15 (diff)
downloadpoky-98bf7dea84bb6ef960ff6e8755476f50779ee35c.tar.gz
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] (From OE-Core rev: 1f35b05d60f4e84554c5ee837cb071815e12c91c) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-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"
650do_populate_lic[sstate-inputdirs] = "${LICSSTATEDIR}" 650do_populate_lic[sstate-inputdirs] = "${LICSSTATEDIR}"
651do_populate_lic[sstate-outputdirs] = "${LICENSE_DIRECTORY}/" 651do_populate_lic[sstate-outputdirs] = "${LICENSE_DIRECTORY}/"
652 652
653ROOTFS_POSTPROCESS_COMMAND_prepend = "write_package_manifest; write_deploy_manifest; license_create_manifest; " 653ROOTFS_POSTPROCESS_COMMAND_prepend = "write_package_manifest; license_create_manifest; "
654do_rootfs[recrdeptask] += "do_populate_lic" 654do_rootfs[recrdeptask] += "do_populate_lic"
655 655
656IMAGE_POSTPROCESS_COMMAND_prepend = "write_deploy_manifest; "
657do_image[recrdeptask] += "do_populate_lic"
658
656do_populate_lic_setscene[dirs] = "${LICSSTATEDIR}/${PN}" 659do_populate_lic_setscene[dirs] = "${LICSSTATEDIR}/${PN}"
657do_populate_lic_setscene[cleandirs] = "${LICSSTATEDIR}" 660do_populate_lic_setscene[cleandirs] = "${LICSSTATEDIR}"
658python do_populate_lic_setscene () { 661python do_populate_lic_setscene () {