[oe-commits] =?UTF-8?Q?Christian=20Zieth=C3=A9n=20?=: boot-directdisk: Make kernel image inclusion conditional.

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 4a258f88a5caadab51c5ede9de015be012d55689
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=4a258f88a5caadab51c5ede9de015be012d55689

Author: Christian Ziethén <christian.ziethen at linaro.org>
Date:   Thu Jul 23 16:32:29 2015 +0200

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 at linaro.org>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/classes/boot-directdisk.bbclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass
index c576523..e1ec1be 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