summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2019-08-20 06:06:47 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-06 14:58:10 +0100
commitc143a3c4eaa901481e9e8bf0a48f32bbb8c100bb (patch)
tree6f20489bbe53ddab1bf7970d56adb598b887d012 /meta
parent13d9021a7ef855251918621dc072c4ecb42d885d (diff)
downloadpoky-c143a3c4eaa901481e9e8bf0a48f32bbb8c100bb.tar.gz
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 ] (From OE-Core rev: ab61a11623ac0a25ba1c98d686c79815abab573f) Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/kernel.bbclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index bf3674238f..ebcb79a528 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -96,8 +96,10 @@ python __anonymous () {
96 d.setVar('ALLOW_EMPTY_%s-image-%s' % (kname, typelower), '1') 96 d.setVar('ALLOW_EMPTY_%s-image-%s' % (kname, typelower), '1')
97 97
98 image = d.getVar('INITRAMFS_IMAGE') 98 image = d.getVar('INITRAMFS_IMAGE')
99 image_bundle = d.getVar('INITRAMFS_IMAGE_BUNDLE') 99 # If the INTIRAMFS_IMAGE is set but the INITRAMFS_IMAGE_BUNDLE is set to 0,
100 if image and bb.utils.to_boolean(image_bundle, False): 100 # the do_bundle_initramfs does nothing, but the INITRAMFS_IMAGE is built
101 # standalone for use by wic and other tools.
102 if image:
101 d.appendVarFlag('do_bundle_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete') 103 d.appendVarFlag('do_bundle_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
102 104
103 # NOTE: setting INITRAMFS_TASK is for backward compatibility 105 # NOTE: setting INITRAMFS_TASK is for backward compatibility