| Message ID | 1437661949-9295-2-git-send-email-christian.ziethen@linaro.org |
|---|---|
| State | Accepted |
| Commit | 7d476f117c62e532c99abef5728e729b8001fa32 |
| Headers | show |
ping On 2015-07-23 16:32, Christian Ziethén wrote: > When building for qcow2 and a dummy kernel, avoid installing > a non existing bzImage. > > Signed-off-by: Christian Ziethén <christian.ziethen@linaro.org> > --- > 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 d256fff..600e21a 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 > -- > 2.1.4 >
diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass index d256fff..600e21a 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
When building for qcow2 and a dummy kernel, avoid installing a non existing bzImage. Signed-off-by: Christian Ziethén <christian.ziethen@linaro.org> --- meta/classes/boot-directdisk.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)