Fix for CVE-2017-1000366 in glibc

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

diff --git a/meta-netboot/classes/netboot.bbclass b/meta-netboot/classes/netboot.bbclass
index 0bb2452..753ef79 100644 (file)
--- a/meta-netboot/classes/netboot.bbclass
+++ b/meta-netboot/classes/netboot.bbclass
@@ -9,13 +9,14 @@ python () {
        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","%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");