SPEC-3723: restructure meta-agl

[AGL/meta-agl.git] / meta-netboot / classes / netboot.bbclass

diff --git a/meta-netboot/classes/netboot.bbclass b/meta-netboot/classes/netboot.bbclass
index 5d5ccbb..a18d64f 100644 (file)
--- a/meta-netboot/classes/netboot.bbclass
+++ b/meta-netboot/classes/netboot.bbclass
@@ -1,25 +1,27 @@
 # 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 ''}"
+OVERRIDES .= ":netboot"
+# add 512MB of extra space in ext4 output image
+IMAGE_ROOTFS_EXTRA_SPACE = "524288"
+NETBOOT_ENABLED ??= "1"
 
 python () {
-       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))
-               d.setVar("INITRD_LIVE","%s/%s-%s.ext4.gz" % (
-                       d.getVar("DEPLOY_DIR_IMAGE",True),
-                       d.getVar("INITRD_IMAGE_LIVE",True),
-                       d.getVar("MACHINE",True)
-               ))
-       else:
-               d.setVar("INITRAMFS_IMAGE","initramfs-netboot-image")
-               if (d.getVar("KERNEL_IMAGETYPE",True) == "uImage"):
-                       # case for "old" u-boot images, like Porter board
-                       d.setVar("NETBOOT_FSTYPES", "ext4.gz.u-boot");
-               else:
-                       # case for new u-boot images which don't require uImage format 
-                       d.setVar("NETBOOT_FSTYPES", "ext4.gz");
+    if (bb.utils.contains("IMAGE_FSTYPES","live",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))
+        d.setVar("INITRD_LIVE","%s/%s-%s.ext4.gz" % (
+            d.getVar("DEPLOY_DIR_IMAGE",True),
+            d.getVar("INITRD_IMAGE_LIVE",True),
+            d.getVar("MACHINE",True)
+        ))
+    else:
+        d.setVar("INITRAMFS_IMAGE","initramfs-netboot-image")
+        if (d.getVar("KERNEL_IMAGETYPE",True) == "uImage"):
+            # case for "old" u-boot images, like Porter board
+            d.setVar("NETBOOT_FSTYPES", "ext4.gz.u-boot");
+        else:
+            # case for new u-boot images which don't require uImage format
+            d.setVar("NETBOOT_FSTYPES", "ext4.gz");
 }