summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMing Liu <liu.ming50@gmail.com>2019-05-14 20:31:50 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-16 09:16:19 +0100
commit6676411fccff2d331878e4ca1f9411aafb056a80 (patch)
tree6a55d16ee4bf0aa2c14f5baa5389f8ad6903386f
parentc72b6d46d392bfbcf54154f43663a7a8ada8c567 (diff)
downloadopenembedded-core-contrib-6676411fccff2d331878e4ca1f9411aafb056a80.tar.gz
kernel.bbclass: adjust a condition checking
do_bundle_initramfs does not have to depend on ${INITRAMFS_IMAGE}:do_image_complete if INITRAMFS_IMAGE_BUNDLE is not set. Signed-off-by: Ming Liu <liu.ming50@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index b346a6059a..437b8c7671 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -95,7 +95,8 @@ python __anonymous () {
d.setVar('ALLOW_EMPTY_%s-image-%s' % (kname, typelower), '1')
image = d.getVar('INITRAMFS_IMAGE')
- if image:
+ image_bundle = d.getVar('INITRAMFS_IMAGE_BUNDLE')
+ if image and bb.utils.to_boolean(image_bundle, False):
d.appendVarFlag('do_bundle_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
# NOTE: setting INITRAMFS_TASK is for backward compatibility