X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-netboot%2Fclasses%2Fnetboot.bbclass;h=363e6bcc9518b5fa0ee843f2d634d90a6a387e14;hb=5ad0538d20ca8f66af9f94cb63b10b303f6277cb;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..363e6bcc9 100644
--- a/meta-netboot/classes/netboot.bbclass
+++ b/meta-netboot/classes/netboot.bbclass
@@ -1,26 +1,22 @@
 # 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","%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");
 }