From 6d0620bb017cc66c4866046b602e8d595fedb354 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 5 Oct 2017 16:51:54 -0400 Subject: meta-agl-bsp: Re-merge image-vm/image.bbclass overlays As part of the pyro merge we need to continue to overlay these classes in order to support vmdk.xz. While upstream has some of the underlying required changes, we had dropped 'vmdk' as a standalone image type and now have 'wic.vmdk' there. This was too invasive for pyro however. This in turn means that we carry vmdk.xz support here. Another part of this is that in some places we were checking only for the string vmdk but also need to check for the string vmdk.xz as well. Update these locations to use bb.utils.contains_any so that we can catch both easily. Bug-AGL: SPEC-899, SPEC-775, SPEC-776 Change-Id: I0cc3c06d59c97c0a76819209e313bc6f5495cc31 Signed-off-by: Tom Rini Reviewed-on: https://gerrit.automotivelinux.org/gerrit/11153 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(-) (limited to 'meta-netboot') diff --git a/meta-netboot/classes/netboot.bbclass b/meta-netboot/classes/netboot.bbclass index 5d5ccbbb2..65ca4a15d 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) or bb.utils.contains("IMAGE_FSTYPES","vmdk",True,False,d)): + if (bb.utils.contains_any("IMAGE_FSTYPES",["live","vmdk","vmdk.xz"],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)) -- cgit 1.2.3-korg