[oe-commits] [openembedded-core] 10/11: Revert "kernel.bbclass: adjust a condition checking"

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 91d02f6b5330f53d772919f3aef96402acdf97b6
Author: Jason Wessel <jason.wessel at windriver.com>
AuthorDate: Tue Aug 20 06:06:47 2019 -0700

    Revert "kernel.bbclass: adjust a condition checking"
    
    This reverts commit 6676411fccff2d331878e4ca1f9411aafb056a80.
    
    This revert restores the original code and adds a comment.  The commit
    that was reverted broke a number of wic templates and tools which rely
    on the initramfs creation dependency and the case where the
    INITRAMFS_IMAGE_BUNDLE is not set.
    
    If an end user does not want the INITRAMFS_IMAGE generated, it should
    be set to "".
    
    [ Issue: LIN1019-1791 ]
    
    Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/kernel.bbclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index bf36742..ebcb79a 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -96,8 +96,10 @@ python __anonymous () {
         d.setVar('ALLOW_EMPTY_%s-image-%s' % (kname, typelower), '1')
 
     image = d.getVar('INITRAMFS_IMAGE')
-    image_bundle = d.getVar('INITRAMFS_IMAGE_BUNDLE')
-    if image and bb.utils.to_boolean(image_bundle, False):
+    # If the INTIRAMFS_IMAGE is set but the INITRAMFS_IMAGE_BUNDLE is set to 0,
+    # the do_bundle_initramfs does nothing, but the INITRAMFS_IMAGE is built
+    # standalone for use by wic and other tools.
+    if image:
         d.appendVarFlag('do_bundle_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
 
     # NOTE: setting INITRAMFS_TASK is for backward compatibility

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.