Change image type to wic.vmdk

vmdk image type is changed to wic.vmdk in upstream.

(From Poky rev: 9d07c736e39a9aa922630b4241eda185a19a11ea)
(From OE-Core rev: 929ba563f1bc7195c4981b8e139c432b2cc388ea)

Bug-AGL: SPEC-1181

Change-Id: I94fab8ce4d075776b5f72d1c270a333d6b34a4b7
Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com>

diff --git a/README-AGL.md b/README-AGL.md
index bb6e8aa..146d6ff 100644 (file)
--- a/README-AGL.md
+++ b/README-AGL.md
@@ -173,7 +173,7 @@ To build an image from 'meta-agl'
      >      $ bitbake agl-demo-platform
 
  - If you want to run QEMU directly as VM in Virtual Box or your other favorite VM software then add this line to your "conf/local.conf" file.
-     >      IMAGE_FSTYPES += "vmdk"
+     >      IMAGE_FSTYPES += "wic.vmdk"
 
 5. Run in the emulator
      >      $ runqemu agl-image-ivi qemux86-64
@@ -194,7 +194,7 @@ To build an image from 'meta-agl'
      >      $ runqemu agl-image-ivi qemux86-64 bootparams="uvesafb.mode_option=1280x720-32" serial
 
        **Or use the virtual disk in Virtual Box from this location:**
-       > tmp/deploy/images/qemux86-64/agl-demo-platform-qemux86-64.vmdk
+       > tmp/deploy/images/qemux86-64/agl-demo-platform-qemux86-64.wic.vmdk
 
 6.  Some weston samples are available from weston terminal (click top left icon).
    Check the folder `/opt/AGL/ALS2016`.

diff --git a/meta-agl-bsp/conf/include/agl_qemux86-64.inc b/meta-agl-bsp/conf/include/agl_qemux86-64.inc
index 3ad9c51..165deae 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_qemux86-64.inc
+++ b/meta-agl-bsp/conf/include/agl_qemux86-64.inc
@@ -21,7 +21,8 @@ APPEND += "quiet"
 DISTRO_FEATURES_append = " sota"
 
 # Image support
-AGL_EXTRA_IMAGE_FSTYPES = "vmdk.xz"
+AGL_EXTRA_IMAGE_FSTYPES = "wic.vmdk"
+IMAGE_BOOT_FILES_sota = "u-boot-qemux86-64.rom"
 
 # Root device
 ROOT_VM = "root=PARTUUID=${DISK_SIGNATURE}-02"

diff --git a/meta-agl/conf/include/agl-devel.inc b/meta-agl/conf/include/agl-devel.inc
index c241435..fd11ade 100644 (file)
--- a/meta-agl/conf/include/agl-devel.inc
+++ b/meta-agl/conf/include/agl-devel.inc
@@ -4,7 +4,7 @@ IMAGE_INSTALL_append = " \
     packagegroup-agl-devel \
 "
 
-IMAGE_INSTALL_append = "${@bb.utils.contains_any('IMAGE_FSTYPES', [ 'vmdk', 'vmdk.xz' ], ' open-vm-tools vboxguestdrivers', '', d)}"
+IMAGE_INSTALL_append = "${@bb.utils.contains('IMAGE_FSTYPES', 'wic.vmdk', ' open-vm-tools vboxguestdrivers', '', d)}"
 
 # disable install of debug files in SDK
 # initial value: SDKIMAGE_FEATURES="dev-pkgs dbg-pkgs staticdev-pkgs"

diff --git a/meta-netboot/classes/netboot.bbclass b/meta-netboot/classes/netboot.bbclass
index 1cdfd5f..363e6bc 100644 (file)
--- a/meta-netboot/classes/netboot.bbclass
+++ b/meta-netboot/classes/netboot.bbclass
@@ -1,7 +1,7 @@
 # Enable network bootable image and initrd/initramfs
 
 python () {
-       if (bb.utils.contains_any("IMAGE_FSTYPES",["live","vmdk","vmdk.xz"],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))