summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMing Liu <liu.ming50@gmail.com>2019-05-14 20:31:50 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-16 09:16:50 +0100
commitea8755459fc7ea6dfaaea4a32a790ae7e80776ca (patch)
tree07d349852929bb42e637ef6491f9f1158a99654f
parente47715708729fe3fed2c5bcafa06f5f1c84f302f (diff)
downloadpoky-ea8755459fc7ea6dfaaea4a32a790ae7e80776ca.tar.gz
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. (From OE-Core rev: 6676411fccff2d331878e4ca1f9411aafb056a80) Signed-off-by: Ming Liu <liu.ming50@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel.bbclass3
1 files changed, 2 insertions, 1 deletions
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 () {
95 d.setVar('ALLOW_EMPTY_%s-image-%s' % (kname, typelower), '1') 95 d.setVar('ALLOW_EMPTY_%s-image-%s' % (kname, typelower), '1')
96 96
97 image = d.getVar('INITRAMFS_IMAGE') 97 image = d.getVar('INITRAMFS_IMAGE')
98 if image: 98 image_bundle = d.getVar('INITRAMFS_IMAGE_BUNDLE')
99 if image and bb.utils.to_boolean(image_bundle, False):
99 d.appendVarFlag('do_bundle_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete') 100 d.appendVarFlag('do_bundle_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
100 101
101 # NOTE: setting INITRAMFS_TASK is for backward compatibility 102 # NOTE: setting INITRAMFS_TASK is for backward compatibility