diff options
| author | Ming Liu <liu.ming50@gmail.com> | 2017-09-26 14:31:16 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-08 19:54:22 +0000 |
| commit | 276ff1f22d00edd6c9728e44ed5d6692a6c9e04f (patch) | |
| tree | 112f1ee14b493bfc6746035b316155d97fb9bcad /meta/classes | |
| parent | 8e8251582e977d7c6ab525ac1b493fbbe3af38b2 (diff) | |
| download | openembedded-core-276ff1f22d00edd6c9728e44ed5d6692a6c9e04f.tar.gz openembedded-core-276ff1f22d00edd6c9728e44ed5d6692a6c9e04f.tar.bz2 openembedded-core-276ff1f22d00edd6c9728e44ed5d6692a6c9e04f.zip | |
image.bbclass: let do_image depend on do_populate_lic of EXTRA_IMAGEDEPENDS
The licenses of EXTRA_IMAGEDEPENDS recipes are being referenced in
image postcommand write_deploy_manifest, but a dependency is missing
between do_image and do_populate_lic of EXTRA_IMAGEDEPENDS recipes,
this leads some license files not present when write_deploy_manifest
runs, hence will cause build errors.
Fixed by letting do_image depend on do_populate_lic of
EXTRA_IMAGEDEPENDS recipes.
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/image.bbclass | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 20240ba9f0..d93de02b75 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -145,14 +145,18 @@ IMAGE_TYPE_wic = "image_types_wic" inherit ${IMAGE_TYPE_wic} python () { + def extraimage_getdepends(task): + deps = "" + for dep in (d.getVar('EXTRA_IMAGEDEPENDS') or "").split(): + deps += " %s:%s" % (dep, task) + return deps + + d.appendVarFlag('do_image', 'depends', extraimage_getdepends('do_populate_lic')) + d.appendVarFlag('do_image_complete', 'depends', extraimage_getdepends('do_populate_sysroot')) + deps = " " + imagetypes_getdepends(d) d.appendVarFlag('do_rootfs', 'depends', deps) - deps = "" - for dep in (d.getVar('EXTRA_IMAGEDEPENDS') or "").split(): - deps += " %s:do_populate_sysroot" % dep - d.appendVarFlag('do_image_complete', 'depends', deps) - #process IMAGE_FEATURES, we must do this before runtime_mapping_rename #Check for replaces image features features = set(oe.data.typed_value('IMAGE_FEATURES', d)) |