6 files changed, 22 insertions, 67 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"
diff --git a/meta-boot2qt/classes/image-hdd.bbclass b/meta-boot2qt/classes/image-hdd.bbclass
deleted file mode 100644
index bceb1b1..0000000
--- a/meta-boot2qt/classes/image-hdd.bbclass
+++ /dev/null
@@ -1,48 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-
-VM_ROOTFS_TYPE = "ext3"
-ROOT_VM = "root=/dev/hda2"
-LABELS_VM = "boot"
-AUTO_SYSLINUXMENU = "0"
-SYSLINUX_DEFAULT_CONSOLE = "console=ttyS0,115200"
-
-inherit image_types image-vm
-
-create_hdd_image () {
-    cd ${IMGDEPLOYDIR}
-    rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdd
-    ln -s ${IMAGE_NAME}.hdddirect ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdd
-}
-
-python do_hddimg() {
-        bb.build.exec_func('create_hdd_image', d)
-}
-
-addtask hddimg after do_bootdirectdisk before do_image_complete
diff --git a/meta-boot2qt/classes/image_types_sdcard.bbclass b/meta-boot2qt/classes/image_types_sdcard.bbclass
index 3258dbd..4ec38e5 100644
--- a/meta-boot2qt/classes/image_types_sdcard.bbclass
+++ b/meta-boot2qt/classes/image_types_sdcard.bbclass
@@ -34,14 +34,14 @@ IMAGE_CMD_wic_append() {
     ln -s ${IMAGE_NAME}.rootfs.wic ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
 }
 
-IMAGE_CMD_rpi-sdimg_append() {
-    rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
-    ln -s ${IMAGE_NAME}.rootfs.rpi-sdimg ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
+IMAGE_CMD_wic_append_emulator() {
+    rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdd
+    ln -s ${IMAGE_NAME}.rootfs.wic ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdd
 }
 
-build_hddimg_append() {
+IMAGE_CMD_rpi-sdimg_append() {
     rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
-    ln -s ${IMAGE_NAME}.hddimg ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
+    ln -s ${IMAGE_NAME}.rootfs.rpi-sdimg ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img
 }
 
 do_image_tegraflash[depends] += "parted-native:do_populate_sysroot"
diff --git a/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf_4.3.30.bb b/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf_5.2.18.bb
index 1eb2652..6dba661 100644
--- a/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf_4.3.30.bb
+++ b/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf_5.2.18.bb
@@ -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.
@@ -36,13 +36,13 @@ SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/VirtualBox-${PV}.tar.
           file://mount-vboxsf.service \
           "
 
-SRC_URI[md5sum] = "cc053340f88922a11ad9d4fab56557bd"
-SRC_URI[sha256sum] = "ea9569ec16cd6202ee61bcadb2506d31ac12fd343adb91565773a05eaaea9a36"
+SRC_URI[md5sum] = "d8e291525b84569356773eef507c49ce"
+SRC_URI[sha256sum] = "ed0a7efd56c7f39fae79c7ec3321473da412ef0d7914457b66f42679d513efcf"
 
 S = "${WORKDIR}/VirtualBox-${PV}/src/VBox/Additions/linux/sharedfolders"
 
 do_compile() {
-    ${CC} ${LDFLAGS} mount.vboxsf.c vbsfmount.c -o mount.vboxsf
+    ${CC} ${LDFLAGS} -I../../../../../include -DIN_RING3 mount.vboxsf.c vbsfmount.c -o mount.vboxsf
 }
 
 do_install() {
diff --git a/meta-boot2qt/recipes-devtools/virtualbox/virtualbox-guest-additions_5.1.16.bb b/meta-boot2qt/recipes-devtools/virtualbox/virtualbox-guest-additions_5.2.18.bb
index 752d8cb..a727c6f 100644
--- a/meta-boot2qt/recipes-devtools/virtualbox/virtualbox-guest-additions_5.1.16.bb
+++ b/meta-boot2qt/recipes-devtools/virtualbox/virtualbox-guest-additions_5.2.18.bb
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 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.
@@ -38,18 +38,20 @@ PR = "${MACHINE_KERNEL_PR}"
 
 SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/VirtualBox-${PV}.tar.bz2"
 
-SRC_URI[md5sum] = "37ebbd51370841eed8ab80f2f38446d6"
-SRC_URI[sha256sum] = "78071c3172f3bd3c7981c352c3ae6c6a9c01f6ab24bc0aa7ec79f3528b2291a7"
+SRC_URI[md5sum] = "d8e291525b84569356773eef507c49ce"
+SRC_URI[sha256sum] = "ed0a7efd56c7f39fae79c7ec3321473da412ef0d7914457b66f42679d513efcf"
 
 S = "${WORKDIR}/vbox"
 
 export KERN_DIR="${STAGING_KERNEL_DIR}"
+export KERN_VER="${KERNEL_VERSION}"
 export KBUILD_VERBOSE="1"
 export BUILD_TARGET_ARCH="${ARCH}"
 
 do_compile_prepend() {
-    ${WORKDIR}/VirtualBox-${PV}/src/VBox/Additions/linux/export_modules ${WORKDIR}/vbox.tar.gz
+    ${WORKDIR}/VirtualBox-${PV}/src/VBox/Additions/linux/export_modules.sh ${WORKDIR}/vbox.tar.gz
     tar xf ${WORKDIR}/vbox.tar.gz -C ${WORKDIR}/vbox
+    find ${WORKDIR}/vbox -name Makefile.include.header | xargs sed -i -e '/KERN_DIR :=/d'
 }
 
 do_install() {