]> code.ossystems Code Review - openembedded-core.git/commitdiff
kernel.bbclass: adjust a condition checking
authorMing Liu <liu.ming50@gmail.com>
Tue, 14 May 2019 18:31:50 +0000 (20:31 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 16 May 2019 08:16:19 +0000 (09:16 +0100)
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>
meta/classes/kernel.bbclass

index b346a6059a420135652d8ca37219e52eae5a1ef6..437b8c7671e5388378870088df5b8ea23c286872 100644 (file)
@@ -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