From e6aef6755ad266f3d1a0fdf14e5924077d12cf8a Mon Sep 17 00:00:00 2001 From: Matt Ranostay Date: Sat, 8 Jul 2017 06:32:39 +0300 Subject: [PATCH] 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 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/10177 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller --- meta-netboot/classes/netboot.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)) -- 2.16.6