From: Christian Ziethén <christian.ziethen@linaro.org>
Date: Thu, 23 Jul 2015 14:32:29 +0000 (+0200)
Subject: boot-directdisk: Make kernel image inclusion conditional.
X-Git-Tag: 2015-10~1115
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=7d476f117c62e532c99abef5728e729b8001fa32;p=openembedded-core.git

boot-directdisk: Make kernel image inclusion conditional.

When building for qcow2 and a dummy kernel, avoid installing
a non existing bzImage.

Signed-off-by: Christian Ziethén <christian.ziethen@linaro.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass
index c5765233ac..e1ec1be534 100644
--- a/meta/classes/boot-directdisk.bbclass
+++ b/meta/classes/boot-directdisk.bbclass
@@ -70,7 +70,9 @@ boot_direct_populate() {
 	install -d $dest
 
 	# Install bzImage, initrd, and rootfs.img in DEST for all loaders to use.
-	install -m 0644 ${DEPLOY_DIR_IMAGE}/bzImage $dest/vmlinuz
+	if [ -e ${DEPLOY_DIR_IMAGE}/bzImage ]; then
+		install -m 0644 ${DEPLOY_DIR_IMAGE}/bzImage $dest/vmlinuz
+	fi
 
 	# initrd is made of concatenation of multiple filesystem images
 	if [ -n "${INITRD}" ]; then