Commit c92c35b7 authored by Jeff Huang's avatar Jeff Huang 🤔

[skip-ci] virtualbox: update to 6.0.8

parent 061b4e26
Pipeline #3557 skipped
diff --git a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
index 623485e9..5068906f 100644
--- a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
+++ b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
@@ -58,7 +58,7 @@ VBOXMOD_DEFS = \
RT_WITH_VBOX \
VBOX_WITH_HARDENING \
VBOX_WITH_64_BITS_GUESTS # <-- must be consistent with Config.kmk!
-VBOXMOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement
+VBOXMOD_CFLAGS = -include $(VBOXNETADPT_DIR)include/VBox/SUPDrvMangling.h -fno-pie -Wno-declaration-after-statement
include $(obj)/Makefile-footer.gmk
diff --git a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp
index 6ad7df3e..2f12c277 100644
--- a/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp
+++ b/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp
@@ -162,6 +162,9 @@ static int vbglR3GuestCtrlMsgWaitFor(uint32_t idClient, uint32_t *pidMsg, uint32
*/
DECL_NO_INLINE(static, bool) vbglR3GuestCtrlDetectPeekGetCancelSupport(uint32_t idClient)
{
+
+ return false;
+
/*
* Seems we get VINF_SUCCESS back from the host if we try unsupported
* guest control functions, so we need to supply some random message
diff --git a/src/VBox/HostDrivers/linux/Makefile b/src/VBox/HostDrivers/linux/Makefile
index 18466b48..7c7de4e5 100644
--- a/src/VBox/HostDrivers/linux/Makefile
+++ b/src/VBox/HostDrivers/linux/Makefile
@@ -23,25 +23,25 @@
# terms and conditions of either the GPL or the CDDL or both.
#
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KBUILD_EXTMOD),)
-# Building from kBuild (make -C <kernel_directory> M=`pwd`),
-# or inside a kernel source tree.
+# Building from kBuild (make -C <kernel_directory> M=`pwd`).
+# KBUILD_EXTMOD is set to $(M) in this case.
obj-m = vboxdrv/
-ifneq ($(wildcard $(CURDIR)/vboxnetflt/Makefile),)
+ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxnetflt/Makefile),)
obj-m += vboxnetflt/
endif
-ifneq ($(wildcard $(CURDIR)/vboxnetadp/Makefile),)
+ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxnetadp/Makefile),)
obj-m += vboxnetadp/
endif
-ifneq ($(wildcard $(CURDIR)/vboxpci/Makefile),)
+ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxpci/Makefile),)
obj-m += vboxpci/
endif
-else # ! KERNELRELEASE
+else # ! KBUILD_EXTMOD
-# convenience Makefile without KERNELRELEASE
+# convenience Makefile without KBUILD_EXTMOD
KBUILD_VERBOSE ?=
KERN_VER ?= $(shell uname -r)
@@ -146,4 +146,4 @@ load: unload
fi; \
done
-endif # ! KERNELRELEASE
+endif # ! KBUILD_EXTMOD
......@@ -10,7 +10,7 @@ pkgname=('virtualbox'
'virtualbox-guest-iso'
'virtualbox-ext-vnc'
'virtualbox-ext-oracle')
pkgver=6.0.6
pkgver=6.0.8
pkgrel=1
_vboxsf_commit='8dd4b8bd5cfe6ddae8fe7056dff790013b985d22'
arch=('x86_64')
......@@ -78,18 +78,19 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
'005-gsoap-build.patch'
'006-rdesktop-vrdp-keymap-path.patch'
'008-no-vboxvideo.patch'
'009-include-path.patch'
'011-python-3-7.patch'
'012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch'
'013-Makefile.patch'
# The following patch and mount.vboxsf wrapper should be removed
# once support for mainline-style options string gets upstreamed
'012-vboxsf-automount.patch'
'101-vboxsf-automount.patch'
'mount.vboxsf'
'PUEL')
noextract=(VBoxGuestAdditions_$pkgver.iso
"Oracle_VM_VirtualBox_Extension_Pack-$pkgver.vbox-extpack")
sha256sums=('3419c49a90cef7f0a5781426259d47d7871457ab0fd201ec0fca83321441e552'
'832152b63630ceb2f89fb460eeb35b74a1218df903758157f785122392d32ceb'
'794f023a186bd217c29c3d30bd1434b6e9de3b242c7bf740d06d10f2d3d981c6'
sha256sums=('1b5aa85118c62fb67867b95167b05e66aa154b2caf44c0a3dc932ea5bee85d87'
'4cb9a805267d8d338bfad0f3cef8b83132be6cad622c311daa41a18cc2ea4fda'
'6d89127c7f043fa96592da96ca87ac5ee9a7afd347d788380f91b695b67d7954'
'SKIP'
'deb03efa7ad0376aa55a087f2e882afe00935f10b0e7aa853ba9147090d341ec'
'c328376b05183d269f98319ec660f54c55e298f77d229977606862b064651a7c'
......@@ -107,8 +108,9 @@ sha256sums=('3419c49a90cef7f0a5781426259d47d7871457ab0fd201ec0fca83321441e552'
'7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46'
'13c6ca9be0f91582445fd2a14a8c58a0625a15d9cb98cb6e8c2736d77ea976ab'
'8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc'
'7055014fde94a41f20d9581615c818fd1f2d249a06864585f562b0a677131e70'
'55224cb74b54b331d691f171efc0d4c058a14f738551f1d8f559146c2908635d'
'81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024'
'da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9'
'a784f3cc24652a16385cc63abac6c5178932ca5f3861be7650631b7dafa753a4'
'f3ed6741f8977f40900c8aa372fa082df1f8723d497d4fff445153c543bc8947'
'715c7246dc0f779ceab39446812362b2f9bf64a55ed5d3a905f053cfab36da9e')
......
......@@ -8,7 +8,7 @@ post_upgrade() {
echo '==> Read modules-load.d man page to disable them.'
fi
echo 'Installing VirtualBox host DKMS modules'
vboxver=6.0.6
vboxver=6.0.8
dkms autoinstall /usr/src/vboxhost-${vboxver}_OSE/dkms.conf || return 0
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment