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, 10 insertions, 8 deletions

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() {