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>

diff --git a/meta-netboot/classes/netboot.bbclass b/meta-netboot/classes/netboot.bbclass
index c74c105..5d5ccbb 100644 (file)
--- 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))