X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-netboot%2Fclasses%2Fnetboot.bbclass;h=363e6bcc9518b5fa0ee843f2d634d90a6a387e14;hb=aadd4e301dbd26cdddaed5053bfe9a2cb362b84f;hp=753ef79e35f1e3b41100f660d5fc6fa2d8d20088;hpb=8741f9087d6f707321f9b87c667c62fd507e22bb;p=AGL%2Fmeta-agl.git

diff --git a/meta-netboot/classes/netboot.bbclass b/meta-netboot/classes/netboot.bbclass
index 753ef79e3..363e6bcc9 100644
--- a/meta-netboot/classes/netboot.bbclass
+++ b/meta-netboot/classes/netboot.bbclass
@@ -1,12 +1,7 @@
 # Enable network bootable image and initrd/initramfs
 
-# add image classes for uboot
-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","wic.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))
@@ -19,9 +14,9 @@ python () {
 		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");
 }