X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-netboot%2Fclasses%2Fnetboot.bbclass;h=63369285f9863d20f0cf6d39878e0869999e458c;hb=7a22b91409c1bff36afc8caae9fd276d9f1bfabe;hp=1cdfd5f8413f7bd7b4cee82bbdfe5ed700b2cb2d;hpb=f924b7ca0040d041309b4b94cb50834095695402;p=AGL%2Fmeta-agl.git diff --git a/meta-netboot/classes/netboot.bbclass b/meta-netboot/classes/netboot.bbclass index 1cdfd5f84..63369285f 100644 --- a/meta-netboot/classes/netboot.bbclass +++ b/meta-netboot/classes/netboot.bbclass @@ -1,22 +1,22 @@ # Enable network bootable image and initrd/initramfs python () { - 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)) - 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"); }