emulator: adapt for yocto thud upgrade

* update virtualbox recipes 5.2.18 -> 5.2.26 as older one does not
  build against new 4.18.14 kernel coming from yocto thud
* rename CONFIG_UPROBE_EVENT -> CONFIG_UPROBE_EVENTS kernel config to
  match new naming scheme

Change-Id: Ida4b14438ead2d4d0544a9c0fdec435a7a29ad74
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

3 files changed, 8 insertions, 6 deletions

diff --git a/meta-boot2qt-distro/recipes-kernel/linux/linux-yocto/uprobe_event.cfg b/meta-boot2qt-distro/recipes-kernel/linux/linux-yocto/uprobe_event.cfg
index aba82da..81f7be9 100644
--- a/meta-boot2qt-distro/recipes-kernel/linux/linux-yocto/uprobe_event.cfg
+++ b/meta-boot2qt-distro/recipes-kernel/linux/linux-yocto/uprobe_event.cfg
@@ -1 +1 @@
-CONFIG_UPROBE_EVENT=y
+CONFIG_UPROBE_EVENTS=y
diff --git a/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf_5.2.18.bb b/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf_5.2.26.bb
index 6dba661..c03236d 100644
--- a/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf_5.2.18.bb
+++ b/meta-boot2qt/recipes-devtools/virtualbox/mount-vboxsf_5.2.26.bb
@@ -36,8 +36,8 @@ SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/VirtualBox-${PV}.tar.
           file://mount-vboxsf.service \
           "
 
-SRC_URI[md5sum] = "d8e291525b84569356773eef507c49ce"
-SRC_URI[sha256sum] = "ed0a7efd56c7f39fae79c7ec3321473da412ef0d7914457b66f42679d513efcf"
+SRC_URI[md5sum] = "4e84cd1aecb67e3f59b3ee06292bb2d0"
+SRC_URI[sha256sum] = "4debe583463be3917ac60ad76a31f6db27586423d86f1f53c060d70d5e70d467"
 
 S = "${WORKDIR}/VirtualBox-${PV}/src/VBox/Additions/linux/sharedfolders"
 
diff --git a/meta-boot2qt/recipes-devtools/virtualbox/virtualbox-guest-additions_5.2.18.bb b/meta-boot2qt/recipes-devtools/virtualbox/virtualbox-guest-additions_5.2.26.bb
index a727c6f..5151cc2 100644
--- a/meta-boot2qt/recipes-devtools/virtualbox/virtualbox-guest-additions_5.2.18.bb
+++ b/meta-boot2qt/recipes-devtools/virtualbox/virtualbox-guest-additions_5.2.26.bb
@@ -38,8 +38,8 @@ PR = "${MACHINE_KERNEL_PR}"
 
 SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/VirtualBox-${PV}.tar.bz2"
 
-SRC_URI[md5sum] = "d8e291525b84569356773eef507c49ce"
-SRC_URI[sha256sum] = "ed0a7efd56c7f39fae79c7ec3321473da412ef0d7914457b66f42679d513efcf"
+SRC_URI[md5sum] = "4e84cd1aecb67e3f59b3ee06292bb2d0"
+SRC_URI[sha256sum] = "4debe583463be3917ac60ad76a31f6db27586423d86f1f53c060d70d5e70d467"
 
 S = "${WORKDIR}/vbox"
 
@@ -48,10 +48,12 @@ export KERN_VER="${KERNEL_VERSION}"
 export KBUILD_VERBOSE="1"
 export BUILD_TARGET_ARCH="${ARCH}"
 
-do_compile_prepend() {
+do_compile() {
     ${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'
+
+    oe_runmake all || die "make failed"
 }
 
 do_install() {