summaryrefslogtreecommitdiffstats
path: root/meta-netboot
diff options
context:
space:
mode:
authorMatt Ranostay <matt.ranostay@konsulko.com>2017-07-08 06:32:39 +0300
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-07-12 22:54:46 +0000
commite6aef6755ad266f3d1a0fdf14e5924077d12cf8a (patch)
treedd072e0ab6df53cc4fb0f674d74b4a3293fc449d /meta-netboot
parent2dcf3bb20b2a2f16136a47a21216484881824387 (diff)
netboot: fix dependency loop for qemu build
qemu images for 64-bit x86 doesn't generate a u-boot image however netboot does by default. Fix this issue by checking for vmdk in image types. Change-Id: I061d61c87c6be9c16a04926d56b0825a3eedde04 Bug-AGL: SPEC-513 Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/10177 Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-netboot')
-rw-r--r--meta-netboot/classes/netboot.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-netboot/classes/netboot.bbclass b/meta-netboot/classes/netboot.bbclass
index c74c10510..5d5ccbbb2 100644
--- a/meta-netboot/classes/netboot.bbclass
+++ b/meta-netboot/classes/netboot.bbclass
@@ -4,7 +4,7 @@
IMAGE_CLASSES += "${@'image_types_uboot' if (d.getVar("KERNEL_IMAGETYPE", True) == "uImage") else ''}"
python () {
- if (bb.utils.contains("IMAGE_FSTYPES","live",True,False,d)):
+ if (bb.utils.contains("IMAGE_FSTYPES","live",True,False,d) or bb.utils.contains("IMAGE_FSTYPES","vmdk",True,False,d)):
# typical case for Minnowboard Max
d.setVar("INITRD_IMAGE","initramfs-netboot-image")
d.setVar("INITRD_IMAGE_LIVE",d.getVar("INITRD_IMAGE",True))