aboutsummaryrefslogtreecommitdiffstats
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:57:22 +0100
commitab61a11623ac0a25ba1c98d686c79815abab573f (patch)
treed89817a414e46278a1ba3c14a36da6c48d04a441
parent62ea5c31be4a1a5eaba83f81d09b36553febb647 (diff)
downloadopenembedded-core-contrib-ab61a11623ac0a25ba1c98d686c79815abab573f.tar.gz
openembedded-core-contrib-ab61a11623ac0a25ba1c98d686c79815abab573f.tar.bz2
openembedded-core-contrib-ab61a11623ac0a25ba1c98d686c79815abab573f.zip
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@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 bf3674238f0..ebcb79a5286 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