From: Ming Liu <liu.ming50@gmail.com>
Date: Tue, 14 May 2019 18:31:50 +0000 (+0200)
Subject: kernel.bbclass: adjust a condition checking
X-Git-Tag: 2019-04.2-warrior~165
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=5bb7ec7a8c510d83bf0ceb0a3132a5bde797ea6c;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 <liu.ming50@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---

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