summaryrefslogtreecommitdiffstats
path: root/meta
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-25 14:41:43 +0100
commitff037a6df6888dbdc8ab205c08c9a42c83fe8c15 (patch)
treedcb88d80979e3ffc7b3649ff80e8c23dbc9081ba /meta
parent66bad556a9c4417f2c5aba04379e27084f26f8af (diff)
downloadpoky-ff037a6df6888dbdc8ab205c08c9a42c83fe8c15.tar.gz
boot-directdisk: Make kernel image inclusion conditional.
When building for qcow2 and a dummy kernel, avoid installing a non existing bzImage. (From OE-Core rev: 7d476f117c62e532c99abef5728e729b8001fa32) Signed-off-by: Christian Ziethén <christian.ziethen@linaro.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 c5765233ac..e1ec1be534 100644
--- a/meta/classes/boot-directdisk.bbclass
+++ b/meta/classes/boot-directdisk.bbclass
@@ -70,7 +70,9 @@ boot_direct_populate() {
70 install -d $dest 70 install -d $dest
71 71
72 # Install bzImage, initrd, and rootfs.img in DEST for all loaders to use. 72 # Install bzImage, initrd, and rootfs.img in DEST for all loaders to use.
73 install -m 0644 ${DEPLOY_DIR_IMAGE}/bzImage $dest/vmlinuz 73 if [ -e ${DEPLOY_DIR_IMAGE}/bzImage ]; then
74 install -m 0644 ${DEPLOY_DIR_IMAGE}/bzImage $dest/vmlinuz
75 fi
74 76
75 # initrd is made of concatenation of multiple filesystem images 77 # initrd is made of concatenation of multiple filesystem images
76 if [ -n "${INITRD}" ]; then 78 if [ -n "${INITRD}" ]; then