From: Ming Liu Date: Tue, 14 May 2019 18:31:50 +0000 (+0200) Subject: kernel.bbclass: adjust a condition checking X-Git-Tag: uninative-2.5~135 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=6676411fccff2d331878e4ca1f9411aafb056a80;p=openembedded-core.git 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 Signed-off-by: Richard Purdie --- 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