diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-11-10 15:30:55 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-12 08:42:28 +0000 |
commit | d001d46d171dfd89ef758ea3bdb02e01ff4b2abb (patch) | |
tree | da2558ffdd7b22f5085fbf1b3c29c59931348855 /meta | |
parent | 777451ca43642e915b3ee9fa76b7a08a0936fa29 (diff) | |
download | poky-d001d46d171dfd89ef758ea3bdb02e01ff4b2abb.tar.gz |
classes/license: fix intermittent license collection warning
Fixes the following warning sometimes appearing during image builds:
WARNING: The license listed ABC was not in the licenses collected for recipe xyz
The files being looked for here, which runs during do_rootfs,
are written out by the do_populate_lic task for each recipe. However,
there was no explicit dependency between do_rootfs and all of the
do_populate_lic tasks to ensure they had run - only an implicit link via
do_build, so it is possible that sometimes they had not depending on how
the tasks were scheduled. Add an explicit set of dependencies to fix
this.
(From OE-Core master rev: ef7dc532e800d9b170246550cbc8703adf624beb)
(From OE-Core rev: f521d8d2d1ea495383f54e5e7c2754dde007f7eb)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/license.bbclass | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index c616a20121..8ad4614d61 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass | |||
@@ -474,6 +474,7 @@ do_populate_lic[sstate-inputdirs] = "${LICSSTATEDIR}" | |||
474 | do_populate_lic[sstate-outputdirs] = "${LICENSE_DIRECTORY}/" | 474 | do_populate_lic[sstate-outputdirs] = "${LICENSE_DIRECTORY}/" |
475 | 475 | ||
476 | ROOTFS_POSTPROCESS_COMMAND_prepend = "write_package_manifest; license_create_manifest; " | 476 | ROOTFS_POSTPROCESS_COMMAND_prepend = "write_package_manifest; license_create_manifest; " |
477 | do_rootfs[recrdeptask] += "do_populate_lic" | ||
477 | 478 | ||
478 | do_populate_lic_setscene[dirs] = "${LICSSTATEDIR}/${PN}" | 479 | do_populate_lic_setscene[dirs] = "${LICSSTATEDIR}/${PN}" |
479 | do_populate_lic_setscene[cleandirs] = "${LICSSTATEDIR}" | 480 | do_populate_lic_setscene[cleandirs] = "${LICSSTATEDIR}" |