diff options
author | Ming Liu <liu.ming50@gmail.com> | 2017-09-26 14:31:16 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-04 17:23:56 +0000 |
commit | 18941419c8ca01735e237f9ae96db260bd958ce2 (patch) | |
tree | 69f27a4b90cc4fb9effecc4c11a62e83145dafcc /meta | |
parent | da8f32a3bb0eec874c66b5f18c08a5b8f15a94c5 (diff) | |
download | poky-18941419c8ca01735e237f9ae96db260bd958ce2.tar.gz |
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.
(From OE-Core rev: 2aa357501f74163f49c62db8660b7a132b5d0d46)
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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" | |||
145 | inherit ${IMAGE_TYPE_wic} | 145 | inherit ${IMAGE_TYPE_wic} |
146 | 146 | ||
147 | python () { | 147 | python () { |
148 | def extraimage_getdepends(task): | ||
149 | deps = "" | ||
150 | for dep in (d.getVar('EXTRA_IMAGEDEPENDS') or "").split(): | ||
151 | deps += " %s:%s" % (dep, task) | ||
152 | return deps | ||
153 | |||
154 | d.appendVarFlag('do_image', 'depends', extraimage_getdepends('do_populate_lic')) | ||
155 | d.appendVarFlag('do_image_complete', 'depends', extraimage_getdepends('do_populate_sysroot')) | ||
156 | |||
148 | deps = " " + imagetypes_getdepends(d) | 157 | deps = " " + imagetypes_getdepends(d) |
149 | d.appendVarFlag('do_rootfs', 'depends', deps) | 158 | d.appendVarFlag('do_rootfs', 'depends', deps) |
150 | 159 | ||
151 | deps = "" | ||
152 | for dep in (d.getVar('EXTRA_IMAGEDEPENDS') or "").split(): | ||
153 | deps += " %s:do_populate_sysroot" % dep | ||
154 | d.appendVarFlag('do_image_complete', 'depends', deps) | ||
155 | |||
156 | #process IMAGE_FEATURES, we must do this before runtime_mapping_rename | 160 | #process IMAGE_FEATURES, we must do this before runtime_mapping_rename |
157 | #Check for replaces image features | 161 | #Check for replaces image features |
158 | features = set(oe.data.typed_value('IMAGE_FEATURES', d)) | 162 | features = set(oe.data.typed_value('IMAGE_FEATURES', d)) |