aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Ziethén <christian.ziethen@linaro.org>2015-07-23 16:32:29 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-24 23:29:41 +0100
commit7d476f117c62e532c99abef5728e729b8001fa32 (patch)
tree8a61c49242eb18d467e4f311b18902c0f0e80c74
parent1c360d05ab39304d28936e0d2ddd815c9f96765c (diff)
downloadopenembedded-core-contrib-7d476f117c62e532c99abef5728e729b8001fa32.tar.gz
openembedded-core-contrib-7d476f117c62e532c99abef5728e729b8001fa32.tar.bz2
openembedded-core-contrib-7d476f117c62e532c99abef5728e729b8001fa32.zip
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>
-rw-r--r--meta/classes/boot-directdisk.bbclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass
index c5765233acc..e1ec1be5343 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