emulator: adapt to sumo

- Use WIC for image creation
- Update VirtualBox components

Change-Id: I48d76906a66477ec844cbdc37c919079a9bd949b
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

2 files changed, 7 insertions, 6 deletions

diff --git a/meta-boot2qt-distro/conf/distro/include/emulator.conf b/meta-boot2qt-distro/conf/distro/include/emulator.conf
index 2c70783..619af16 100644
--- a/meta-boot2qt-distro/conf/distro/include/emulator.conf
+++ b/meta-boot2qt-distro/conf/distro/include/emulator.conf
@@ -27,10 +27,7 @@
 ##
 ############################################################################
 
-IMAGE_CLASSES += "image-hdd"
-IMAGE_ROOTFS_ALIGNMENT = "1048576"
-ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_BASENAME}-${MACHINE}.ext3"
-IMAGE_FSTYPES = "ext3"
+IMAGE_FSTYPES = "ext3 wic"
 
 QBSP_IMAGE_CONTENT = "${IMAGE_LINK_NAME}.hdd"
 
@@ -41,6 +38,8 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 PREFERRED_PROVIDER_virtual/egl = "qtglesstream-dummy-client"
 PREFERRED_PROVIDER_virtual/libgles2 = "qtglesstream-dummy-client"
 
+RDEPENDS_qtbase_pn-qtbase += "qtglesstream"
+
 KERNEL_MODULE_AUTOLOAD += "snd-intel8x0 vboxguest vboxsf"
 
 DISTRO_FEATURES_remove = "webengine opengl wayland vulkan"
@@ -48,5 +47,4 @@ DISTRO_FEATURES_remove = "webengine opengl wayland vulkan"
 MACHINE_EXTRA_INSTALL += "\
         mount-vboxsf \
         qtsystems \
-        qtglesstream \
         "
diff --git a/meta-boot2qt-distro/conf/machine/emulator.conf b/meta-boot2qt-distro/conf/machine/emulator.conf
index 2ab622e..cb18983 100644
--- a/meta-boot2qt-distro/conf/machine/emulator.conf
+++ b/meta-boot2qt-distro/conf/machine/emulator.conf
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -50,3 +50,6 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d virtualbox-guest-additions"
 MACHINE_FEATURES += "apm alsa pcmcia bluetooth irda usbgadget screen"
 
 SYSTEMD_DEFAULT_TARGET = "custom.target"
+
+WKS_FILE = "directdisk.wks"
+do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"