X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-netboot%2Fclasses%2Fnetboot.bbclass;h=65ca4a15da1f648dfe9945c60973128f4af24d3d;hb=6d0620bb017cc66c4866046b602e8d595fedb354;hp=0bb2452ad8651eeb82c0827561ee494731b89074;hpb=56b1139ef2660535b112d0be4ddb2806f75298a8;p=AGL%2Fmeta-agl.git

diff --git a/meta-netboot/classes/netboot.bbclass b/meta-netboot/classes/netboot.bbclass
index 0bb2452ad..65ca4a15d 100644
--- a/meta-netboot/classes/netboot.bbclass
+++ b/meta-netboot/classes/netboot.bbclass
@@ -4,23 +4,22 @@
 IMAGE_CLASSES += "${@'image_types_uboot' if (d.getVar("KERNEL_IMAGETYPE", True) == "uImage") else ''}"
 
 python () {
-	d.appendVar("IMAGE_FSTYPES"," ext4")
-
-	if (bb.utils.contains("IMAGE_FSTYPES","live",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","%s/%s-%s.ext4.gz" % (
+		d.setVar("INITRD_IMAGE_LIVE",d.getVar("INITRD_IMAGE",True))
+		d.setVar("INITRD_LIVE","%s/%s-%s.ext4.gz" % (
 			d.getVar("DEPLOY_DIR_IMAGE",True),
-			d.getVar("INITRD_IMAGE",True),
+			d.getVar("INITRD_IMAGE_LIVE",True),
 			d.getVar("MACHINE",True)
 		))
 	else:
-		d.appendVar("INITRAMFS_IMAGE"," initramfs-netboot-image")
+		d.setVar("INITRAMFS_IMAGE","initramfs-netboot-image")
 		if (d.getVar("KERNEL_IMAGETYPE",True) == "uImage"):
 			# case for "old" u-boot images, like Porter board
-			d.appendVar("INITRAMFS_FSTYPES"," ext4.gz.u-boot");
+			d.setVar("NETBOOT_FSTYPES", "ext4.gz.u-boot");
 		else:
 			# case for new u-boot images which don't require uImage format 
-			d.appendVar("INITRAMFS_FSTYPES"," ext4.gz");
+			d.setVar("NETBOOT_FSTYPES", "ext4.gz");
 }