meta-openembedded: subtree update:76b83194b3..ae39f2e711
Adrian Bunk (3):
libpeas: gobject-introspection is mandatory and cannot be configured
gnome-settings-daemon: smartcard support is optional, and needs nss
gnome-settings-daemon: Remove duplicate outdated SRC_URI hashes
Alex Kiernan (1):
ostree: upgrade 2020.4 -> 2020.5
Andreas Müller (29):
xfce4-whiskermenu-plugin: upgrade 2.4.5 -> 2.4.6
xfwm4: upgrade 4.14.2 -> 4.14.3
xfce4-timer-plugin: upgrade 1.7.0 -> 1.7.1
gnome-desktop3: upgrade 3.36.3.1 -> 3.36.4
evolution-data-server: upgrade 3.36.3 -> 3.36.4
gnome-control-center: upgrade 3.36.3 -> 3.36.4
gtksourceview4: upgrade 4.6.0 -> 4.6.1
libnma: upgrade 1.8.28 -> 1.8.30
libgweather: upgrade 3.36.0 -> 3.36.1
evince: upgrade 3.36.5 -> 3.36.7
exiv2: upgrade 0.27.1 -> 0.27.3
poppler: upgrade 0.89.0 -> 0.90.1
live555: merge recipe with inc
live555: upgrade 20190828 -> 20200721
tumbler: upgrade 0.2.8 -> 0.2.9
xfwm4: upgrade 4.14.3 -> 4.14.4
geoclue: upgrade 2.5.3 -> 2.5.6
gnome-help.bbclass: remove double FILES_${PN}-help entry
gnome-calendar: initial add 3.36.2
imagemagick: upgrade 7.0.9_13 -> 7.0.10_25
libpeas: disable tests when introspection is not enabled/available
udisks2: upgrade 2.8.4+ -> 2.9.1
xfwm4: upgrade 4.14.4 -> 4.14.5
gnome-desktop3: upgrade 3.36.4 -> 3.36.5
file-roller: upgrade 3.36.2 -> 3.36.3
evolution-data-server: upgrade 3.36.4 -> 3.36.5
gnome-disk-utility: re-add 3.36.3
gdm: upgrade 3.36.2 -> 3.36.3
poppler: upgrade 0.90.1 -> 20.08.0
Andrey Konovalov (1):
libcamera: fix packaging and installation
Aníbal Limón (1):
meta-oe: opengl-es-cts install deqp test runners
Armin Kuster (2):
jsoncpp: add PE do to dunfell reverts
libpeas: this depends on gtk3+ add FEATURE CHECK
Arthur She (1):
xmlrpc-c: Upgrade 1.51.03 -> 1.54.02
Changqing Li (1):
mozjs: fix multilib conflict
Colin McAllister (6):
python3-paramiko: Added recipe
python3-lorem: Added recipe
python3-textparser: Added recipe
python3-jdatetime: Added recipe
python3-pynacl: Added recipe
autossh: Created recipe
Daniel Dragomir (1):
rasdaemon: update to 0.6.6 and fix SRC_URI broken link
Gianfranco (4):
dlt-daemon: update to 2.18.5
dlt-daemon: add new dlt-filetransfer PACKAGECONFIG option
dlt-daemon: fix build failure when dlt-dbus is enabled, due to missing service file.
dlt-daemon: enable some configurations by default in PACKAGECONFIG
Gianfranco Costamagna (2):
vboxguestdrivers: upgrade 6.1.6 -> 6.1.12
dlt-daemon: fix build with upstream-proposed patch for MUSL libc
Hongxu Jia (1):
vboxguestdrivers: fix failed to compile with kernel 5.8.0
Jack Mitchell (1):
python3-pybind11: install both python wheel and cmake build
Jacob Kroon (1):
abseil-cpp: Use SkipRecipe exception
James Feist (1):
boost-url: Add recipe
Jens Rehsack (1):
bearssl: add new recipe
Johan Jeppsson (1):
nngpp: Add recipe
Jyothi-k (1):
fmt: 7.0.1 -> 7.0.3
Kai Kang (2):
xfce4-eyes-plugin: 4.5.0 -> 4.5.1
rdist: fix parallel build
Khem Raj (82):
flashrom: Fix build failure with glibc 2.32
spdlog: Upgrade to 1.7.0
gerbera: Upgrade to 1.6.0
libqmi: Delete --enable-more-warnings configure option
gnome-settings-daemon: Drop using autotools specific option
gnome-settings-daemon: Add introspection to UNKNOWN_CONFIGURE_WHITELIST
iwd: Module load dir should be relative to root_dir
libcamera: Fix License names to match SPDX convention
satyr: Upgrade to 0.30
gpm: Upgrade to latest master
gensio: Upgrade to 2.1.4
freeglut: Use -fcommon always
xfsprogs: Upgrade to 5.7.0
freerdp: Upgrade to 2.2.0
htop: Fix build with -fno-common
dialog: Turn X11 support into a packageconfig option
x11vnc: Update to latest on master
vblade: Upgrade to version 24
netperf: Fix build with -fno-common
netplan: Update to latest to fix build with -fno-common
ncftp: Fix build with -fno-common
iscsi-initiator-utils: Upgrade to _2.1.2
tftp-hpa: Fix build with -fno-common
fwknop: Fix build with gcc10
dibbler: Update to latest
quagga: Use -fcommon to compile
drbd: Upgrade to 9.0.24-1
drbd-utils: Uphgrade to 9.13.1
snort: Upgrade to 2.9.16.1
daq: Upgrade to 2.0.7
openlldp: Update to latest master
iftop: Fix build with -fno-common
xfce4-sensors-plugin: Fix build with -fno-common
xfce4-cpufreq-plugin: Fix build with -fno-common
imsettings: Upgrade to 1.8.2
lcdproc: Fix compilation with GCC >= 10.x
openal-soft: Update to 1.20.1
mimic: Upgrade to 1.3.0.1
minidlna: Fix build with -fno-common
tvheadend: Update to latest tip
monkey: Upgrade to 1.6.9
klibc: Compile with -fcommon
kexecboot: Use -fcommon to compile
python3-matplotlib: Use lld for linking when using clang
python3-pandas: Add workaround to fix build with clang
memtester: Fix build with -fno-common
read-edid: Fix build with gcc-10+
owfs: Fix build with -fno-common
sharutils: Fix build with -fno-common
lprng: Fix build with -fno-common
fluentbit: Use -fcommon to compile
fbida: Upgrade to 2.14
ipmitool: Fix build with -fno-common
smstools3: Fix build with -fno-common
sblim-sfcb: Fix build with -fno-common
cdrkit: Fix build with -fno-common
openocd: Fix build with gcc10/-fno-common
liblbxutil: Fix build with gcc10/-fno-common
mg: Upgrade to 20200723 tag
libforms: Fix build with -fno-common
wifi-test-suite: Update to latest tip
xf86-video-ati: Fix link failure with gcc 10
ifplugd: Fix build with gcc10/-fno-common
tcsh: Fix build with -fno-common
makedumpfile: Fix build with -fno-common
nodejs: Upgrade to 12.18.3
opencl-headers: Upgrade to v2020.06.16
ocl-icd: Upgrade to latest
opencl-icd-loader: Update beyond 2020.06.16
fwts: Upgrade to 20.07.00
pegtl: Disable type-limits warning
opensaf: Fix build with -fno-common
crash: Fix arm64 build with -fno-common
minifi-cpp: Fix build with lto/clang
libyui-ncurses: Disable werror with clang
sedutils: Fix build with clang11
directfb: Disable dtor-typedef warning with clang11
gerbera: Disable PIE on rv64
opengl-es-cts: Use SECURITY_NOPIE_CFLAGS
opencv: Upgrade to 4.4.0
minifi-cpp: Fix linking with libxml2
sdbus-c++: Fix ptest packaging
Leon Anavi (80):
python3-pytest-metadata: Upgrade 1.9.0 -> 1.10.0
python3-cmd2: Upgrade 1.1.0 -> 1.2.1
python3-aenum: Upgrade 2.2.3 -> 2.2.4
python3-bitarray: Upgrade 1.4.1 -> 1.4.2
python3-colorlog: Upgrade 4.1.0 -> 4.2.1
python3-matplotlib: Upgrade 3.2.2 -> 3.3.0
python3-urllib3: Upgrade 1.25.9 -> 1.25.10
python3-pywbem: Upgrade 0.17.3 -> 0.17.4
python3-lxml: Upgrade 4.5.1 -> 4.5.2
python3-gmqtt: Upgarde 0.6.5 -> 0.6.7
python3-pyroute2: Upgrade 0.5.12 -> 0.5.13
python3-pymongo: Upgrade 3.10.1 -> 3.11.0
python3-pid: Upgrade 3.0.3 -> 3.0.4
python3-pychromecast: Upgrade 7.1.2 -> 7.2.0
python3-dynamic-dispatch: Upgrade 1.0.2 -> 1.0.3
python3-cbor2: Upgrade 5.1.1 -> 5.1.2
python3-xlsxwriter: Consolidate in a single file
python3-xlsxwriter: Upgrade 1.2.9 -> 1.3.0
python3-cffi: Upgrade 1.14.0 -> 1.14.1
python3-pandas: Upgrade 1.0.5 -> 1.1.0
python3-luma-core: Upgrade 1.14.0 -> 1.14.1
python3-tqdm: Upgrade 4.47.0 -> 4.48.0
python3-asn1crypto: Upgrade 1.3.0 -> 1.4.0
python3-pyalsaaudio: Consolidate in a single file
python3-pyalsaaudio: Upgrade 0.8.4 -> 0.9.0
python3-autobahn: Upgrade 20.6.2 -> 20.7.1
python3-isort: Upgrade 5.1.4 -> 5.2.2
python3-ujson: Upgrade 3.0.0 -> 3.1.0
python3-yarl: Upgrade 1.4.2 -> 1.5.1
python3-openpyxl: Upgrade 3.0.3 -> 3.0.4
python3-cryptography: Upgrade 2.8 -> 3.0
python3-dnspython: Upgrade 1.16.0 -> 2.0.0
python3-regex: Upgrade 2020.6.8 -> 2020.7.14
python3-lazy-object-proxy: Upgrade 1.5.0 -> 1.5.1
python3-xxhash: Upgrade 1.4.4 -> 2.0.0
xxhash: Upgrade 0.7.4 -> 0.8.0
python3-parso: Upgrade 0.7.1 -> 0.8.0
python3-argexec: Upgrade 1.0.2 -> 1.0.3
python3-xlsxwriter: Upgrade 1.3.0 -> 1.3.2
python3-cantools: Upgrade 35.1.0 -> 35.3.0
python3-wtforms: Upgrade 2.3.1 -> 2.3.3
python3-prompt-toolkit: Upgrade 3.0.5 -> 3.0.6
python3-cmd2: Upgrade 1.2.1 -> 1.3.1
python3-luma-core: Upgrade 1.14.1 -> 1.15.0
python3-hyperlink: Upgrade 19.0.0 -> 20.0.1
python3-bitarray: Upgrade 1.4.2 -> 1.5.1
python3-isort: Upgrade 5.2.2 -> 5.3.2
python3-gast: Upgrade 0.3.3 -> 0.4.0
python3-tqdm: Upgrade 4.48.0 -> 4.48.2
python3-sympy: Upgrade 1.6.1 -> 1.6.2
python3-parse: Upgrade 1.15.0 -> 1.16.0
python3-flask-login: Consolidate in a single file
python3-flask-login: Upgrade 0.4.1 -> 0.5.0
python3-graphviz: Upgrade 0.14 -> 0.14.1
python3-huey: Upgrade 2.2.0 -> 2.3.0
python3-rsa: Upgrade 3.4.2 -> 4.6
python3-cmd2: Upgrade 1.3.1 -> 1.3.2
python3-u-msgpack-python: Upgrade 2.6.0 -> 2.7.0
python3-pytest-timeout: Upgrade 1.4.1 -> 1.4.2
python3-javaobj-py3: Upgrade 0.4.0.1 -> 0.4.1
python3-sentry-sdk: Upgrade 0.16.0 -> 0.16.3
python3-coverage: Upgrade 5.2 -> 5.2.1
python3-redis: Upgrade 2.10.6 -> 3.5.3
mosquitto: Upgrade 1.6.10 -> 1.6.11
python3-matplotlib: Upgrade 3.3.0 -> 3.3.1
python3-humanize: Upgrade 2.5.0 -> 2.6.0
python3-bcrypt: Upgrade 3.1.7 -> 3.2.0
python3-isort: Upgrade 5.3.2 -> 5.4.2
python3-cffi: Upgrade 1.14.1 -> 1.14.2
python3-wheel: Upgrade 0.34.2 -> 0.35.1
python3-cmd2: Upgrade 1.3.2 -> 1.3.3
python3-google-api-python-client: Upgrade 1.9.3 -> 1.10.0
python3-bitarray: Upgrade 1.5.1 -> 1.5.2
python3-xlsxwriter: Upgrade 1.3.2 -> 1.3.3
python3-sqlalchemy: Upgrade 1.3.18 -> 1.3.19
python3-sentry-sdk: Upgrade 0.16.3 -> 0.16.5
python3-python-vlc: Upgrade 3.0.10114 -> 3.0.11115
python3-pytest-asyncio: Upgrade 0.12.0 -> 0.14.0
python3-djangorestframework: Consolidate in a single file
python3-djangorestframework: Upgrade 3.9.0 -> 3.11.1
Martin Jansa (2):
khronos-cts: add opengl to REQUIRED_DISTRO_FEATURES
lcov: fix lcov-native build
Mingli Yu (4):
mariadb: upgrade to 10.5.4
mariadb: not use the bundled libpcre2
freeradius: fix the occasional verification failure
fio: upgrade to 3.21
Oleksandr Kravchuk (49):
iwd: update to 1.8
nvme-cli: update to 1.12
dialog: update to 1.3-20200327
libqmi: update to 1.26.0
libmbim: update to 1.24.2
libwebsockets: update to 4.0.20
libkcapi: update to 1.2.0
libbytesize: update to 2.3
libvdpau: update to 1.4
libcec: update to 6.0.2
dctl: update v69
pmdk: update to 1.9
libzip: update to 1.7.3
tmux: update to 3.1b
libjcat: update to 0.1.3
leptonica: update to 1.79.0
libvncserver: update to 0.9.13
libopusenc: add recipe 0.2.1
broadcom-bt-firmware: update to 12.0.1.1105_p2
lsscsi: update to 0.31
opusfile: update to 0.12
libmpdclient: update to 2.19
crossguid: update to 0.2.2
libmediaart: update to 2.0_1.9.4
kronosnet: update to 1.18
keepalived: update to 2.1.5
valijson: update to 0.3
ostree: update to 2020.4
terminus-font: update to 4.48
libteam: update to 1.31
libimobiledevice: update to 1.3.0
libusbmuxd: update to 2.0.2
libplist: update to 2.2.0
usbmuxd: update to 1.1.1
ifuse: update to 1.1.4
libyui: update to 3.10.0
libyui-ncurses: update to 2.55.0
mpc: update to 0.33
ncmpc: update to 0.38
dhcpcd: update to 9.1.4
firewalld: update to 0.8.3
openconnect: update to 8.10
relayd: bump to latest revision
fping: update to 4.4
nano: update to 5.0
broadcom-bt-firmware: add PE back
libpeas: update to 1.26.0
ifenslave: update to 2.11
libupnp: update to 1.14.0
Shlomi Vaknin (11):
monit: Set monit files in temporary locations
python3-ipython: add recipe
python3-traitlets: add recipe
python3-ipython-genutils: add recipe
python3-jedi: add recipe
python3-pickleshare: add recipe
python3-backcall: add recipe
python3-parso: add recipe
prompt-toolkit: fix recipe
json-schema-validator: Add recipe
python3-pybind11-json: Add recipe
Slater, Joseph (4):
lvm2: allow for reproducible binary builds
python3-cryptography: fix two tests
mozjs: specify TMPDIR
aoetool: make builds reproducible
Vijay Khemka (1):
Adding recipe for exprtk
William A. Kennington III (3):
fmt: 6.2.0 -> 7.0.1
cli11: 1.9.0 -> 1.9.1
function2: 4.0.0 -> 4.1.0
Yi Zhao (2):
libldb: upgrade 1.5.7 -> 1.5.8
samba: upgrade 4.10.15 -> 4.10.17
Yue Tao (1):
lua: Security Advisory - lua - CVE-2020-15888
Zang Ruochen (25):
fping: upgrade 4.2 -> 4.3
capnproto: upgrade 0.7.0 -> 0.8.0
c-ares: upgrade 1.16.0 -> 1.16.1
iozone3: upgrade 489 -> 490
ser2net: upgrade 4.1.8 -> 4.2.0
apache-websocket: upgrade 0.1.1 -> 0.1.2
hiawatha: upgrade 10.10 -> 10.11
nostromo: upgrade 1.9.7 -> 1.9.9
purple-skypeweb: upgrade 1.5 -> 1.6
dnsmasq: upgrade 2.81 -> 2.82
linuxptp: upgrade 2.0 -> 3.0
nlohmann-json: upgrade 3.7.3 -> 3.9.0
paho-mqtt-c: upgrade 1.3.2 -> 1.3.4
zlog: upgrade 1.2.14 -> 1.2.15
jasper: upgrade 2.0.16 -> 2.0.19
dash: upgrade 0.5.11 -> 0.5.11.1
libbytesize: upgrade 2.3 -> 2.4
jsonrpc: Fix build with libmicrohttpd 0.9.71
libmicrohttpd: upgrade 0.9.70 -> 0.9.71
rdma-core: upgrade 28.0 -> 30.0
ipc-run: upgrade 20180523.0 -> 20200505.0
uhubctl: upgrade 2.1.0 -> 2.2.0
gsoap: upgrade 2.8.103 -> 2.8.105
libcgi-perl: upgrade 4.48 -> 4.50
redis: upgrade 6.0.5 -> 6.0.6
wonjong.lee (1):
minifi: Add recipe for c++ version
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I003021e0f4c267f79eedf704c43fbb6fdcdaf8b8
diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-fixes_for_mm_struct.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-fixes_for_mm_struct.patch
new file mode 100644
index 0000000..1ad5ce5
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-fixes_for_mm_struct.patch
@@ -0,0 +1,176 @@
+From 98070c936931879d2b8e22939724b5a0689721d0 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Tue, 18 Aug 2020 17:48:29 +0800
+Subject: [PATCH 1/3] fixes_for_mm_struct
+
+Upstream-Status: Backport [https://www.virtualbox.org/ticket/19644]
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ .../Runtime/r0drv/linux/memobj-r0drv-linux.c | 74 +++++++++++++++++--
+ 1 file changed, 67 insertions(+), 7 deletions(-)
+
+diff --git a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
+index 37389bcc..cdc7e8e6 100644
+--- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
++++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
+@@ -222,9 +222,17 @@ static void *rtR0MemObjLinuxDoMmap(RTR3PTR R3PtrFixed, size_t cb, size_t uAlignm
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
+ ulAddr = vm_mmap(NULL, R3PtrFixed, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS | MAP_FIXED, 0);
+ #else
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
+ down_write(&pTask->mm->mmap_sem);
++#else
++ down_write(&pTask->mm->mmap_lock);
++#endif
+ ulAddr = do_mmap(NULL, R3PtrFixed, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS | MAP_FIXED, 0);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
+ up_write(&pTask->mm->mmap_sem);
++#else
++ up_write(&pTask->mm->mmap_lock);
++#endif
+ #endif
+ }
+ else
+@@ -232,9 +240,17 @@ static void *rtR0MemObjLinuxDoMmap(RTR3PTR R3PtrFixed, size_t cb, size_t uAlignm
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
+ ulAddr = vm_mmap(NULL, 0, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS, 0);
+ #else
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
+ down_write(&pTask->mm->mmap_sem);
++#else
++ down_write(&pTask->mm->mmap_lock);
++#endif
+ ulAddr = do_mmap(NULL, 0, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS, 0);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
+ up_write(&pTask->mm->mmap_sem);
++#else
++ up_write(&pTask->mm->mmap_lock);
++#endif
+ #endif
+ if ( !(ulAddr & ~PAGE_MASK)
+ && (ulAddr & (uAlignment - 1)))
+@@ -269,13 +285,29 @@ static void rtR0MemObjLinuxDoMunmap(void *pv, size_t cb, struct task_struct *pTa
+ Assert(pTask == current); RT_NOREF_PV(pTask);
+ vm_munmap((unsigned long)pv, cb);
+ #elif defined(USE_RHEL4_MUNMAP)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
+ down_write(&pTask->mm->mmap_sem);
++#else
++ down_write(&pTask->mm->mmap_lock);
++#endif
+ do_munmap(pTask->mm, (unsigned long)pv, cb, 0); /* should it be 1 or 0? */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
+ up_write(&pTask->mm->mmap_sem);
+ #else
++ up_write(&pTask->mm->mmap_lock);
++#endif
++#else
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
+ down_write(&pTask->mm->mmap_sem);
++#else
++ down_write(&pTask->mm->mmap_lock);
++#endif
+ do_munmap(pTask->mm, (unsigned long)pv, cb);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
+ up_write(&pTask->mm->mmap_sem);
++#else
++ up_write(&pTask->mm->mmap_lock);
++#endif
+ #endif
+ }
+
+@@ -593,7 +625,11 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR0MEMOBJ pMem)
+ size_t iPage;
+ Assert(pTask);
+ if (pTask && pTask->mm)
+- down_read(&pTask->mm->mmap_sem);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
++ down_read(&pTask->mm->mmap_sem);
++#else
++ down_read(&pTask->mm->mmap_lock);
++#endif
+
+ iPage = pMemLnx->cPages;
+ while (iPage-- > 0)
+@@ -608,7 +644,11 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR0MEMOBJ pMem)
+ }
+
+ if (pTask && pTask->mm)
+- up_read(&pTask->mm->mmap_sem);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
++ up_read(&pTask->mm->mmap_sem);
++#else
++ up_read(&pTask->mm->mmap_lock);
++#endif
+ }
+ /* else: kernel memory - nothing to do here. */
+ break;
+@@ -1076,7 +1116,11 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser(PPRTR0MEMOBJINTERNAL ppMem, RTR3PTR R3P
+ papVMAs = (struct vm_area_struct **)RTMemAlloc(sizeof(*papVMAs) * cPages);
+ if (papVMAs)
+ {
+- down_read(&pTask->mm->mmap_sem);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
++ down_read(&pTask->mm->mmap_sem);
++#else
++ down_read(&pTask->mm->mmap_lock);
++#endif
+
+ /*
+ * Get user pages.
+@@ -1162,7 +1206,11 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser(PPRTR0MEMOBJINTERNAL ppMem, RTR3PTR R3P
+ papVMAs[rc]->vm_flags |= VM_DONTCOPY | VM_LOCKED;
+ }
+
+- up_read(&pTask->mm->mmap_sem);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
++ up_read(&pTask->mm->mmap_sem);
++#else
++ up_read(&pTask->mm->mmap_lock);
++#endif
+
+ RTMemFree(papVMAs);
+
+@@ -1189,7 +1237,11 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser(PPRTR0MEMOBJINTERNAL ppMem, RTR3PTR R3P
+ #endif
+ }
+
+- up_read(&pTask->mm->mmap_sem);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
++ up_read(&pTask->mm->mmap_sem);
++#else
++ up_read(&pTask->mm->mmap_lock);
++#endif
+
+ RTMemFree(papVMAs);
+ rc = VERR_LOCK_FAILED;
+@@ -1604,7 +1656,11 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ p
+ const size_t cPages = (offSub + cbSub) >> PAGE_SHIFT;
+ size_t iPage;
+
+- down_write(&pTask->mm->mmap_sem);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
++ down_write(&pTask->mm->mmap_sem);
++#else
++ down_write(&pTask->mm->mmap_lock);
++#endif
+
+ rc = VINF_SUCCESS;
+ if (pMemLnxToMap->cPages)
+@@ -1721,7 +1777,11 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ p
+ }
+ #endif /* CONFIG_NUMA_BALANCING */
+
+- up_write(&pTask->mm->mmap_sem);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
++ up_write(&pTask->mm->mmap_sem);
++#else
++ up_write(&pTask->mm->mmap_lock);
++#endif
+
+ if (RT_SUCCESS(rc))
+ {
+--
+2.18.2
+
diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0002-fixes_for_module_memory.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0002-fixes_for_module_memory.patch
new file mode 100644
index 0000000..a3cfc3b
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0002-fixes_for_module_memory.patch
@@ -0,0 +1,65 @@
+From bb580f7b601e5395a2f8fcb2485387035273320f Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Tue, 18 Aug 2020 17:49:34 +0800
+Subject: [PATCH 2/3] fixes_for_module_memory
+
+Upstream-Status: Backport [https://www.virtualbox.org/ticket/19644]
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ .../Runtime/r0drv/linux/alloc-r0drv-linux.c | 18 ++++++++++++++++--
+ 1 file changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
+index bbb8acc6..45cd34c7 100644
+--- a/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
++++ b/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
+@@ -153,6 +153,8 @@ RT_EXPORT_SYMBOL(RTR0MemExecDonate);
+
+
+ #ifdef RTMEMALLOC_EXEC_VM_AREA
++
++
+ /**
+ * Allocate executable kernel memory in the module range.
+ *
+@@ -168,7 +170,12 @@ static PRTMEMHDR rtR0MemAllocExecVmArea(size_t cb)
+ struct vm_struct *pVmArea;
+ size_t iPage;
+
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
++ pVmArea = __get_vm_area_caller(cbAlloc, VM_ALLOC, MODULES_VADDR, MODULES_END,
++ __builtin_return_address(0));
++#else
+ pVmArea = __get_vm_area(cbAlloc, VM_ALLOC, MODULES_VADDR, MODULES_END);
++#endif
+ if (!pVmArea)
+ return NULL;
+ pVmArea->nr_pages = 0; /* paranoia? */
+@@ -201,14 +208,21 @@ static PRTMEMHDR rtR0MemAllocExecVmArea(size_t cb)
+ # endif
+ pVmArea->nr_pages = cPages;
+ pVmArea->pages = papPages;
+- if (!map_vm_area(pVmArea, PAGE_KERNEL_EXEC,
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
++ unsigned long start = (unsigned long)pVmArea->addr;
++ unsigned long size = get_vm_area_size(pVmArea);
++
++ if (!map_kernel_range(start, size, PAGE_KERNEL_EXEC, papPages))
++#else
++ if (!map_vm_area(pVmArea, PAGE_KERNEL_EXEC,
+ # if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)
+ &papPagesIterator
+ # else
+ papPages
+ # endif
+ ))
+- {
++#endif
++ {
+ PRTMEMLNXHDREX pHdrEx = (PRTMEMLNXHDREX)pVmArea->addr;
+ pHdrEx->pVmArea = pVmArea;
+ pHdrEx->pvDummy = NULL;
+--
+2.18.2
+
diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0003-fixes_for_changes_in_cpu_tlbstate.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0003-fixes_for_changes_in_cpu_tlbstate.patch
new file mode 100644
index 0000000..6a3e63f
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0003-fixes_for_changes_in_cpu_tlbstate.patch
@@ -0,0 +1,39 @@
+From 6089974a81b1b44e1d2dfa5af1fdc110dfee40c1 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Tue, 18 Aug 2020 17:51:24 +0800
+Subject: [PATCH 3/3] fixes_for_changes_in_cpu_tlbstate
+
+Upstream-Status: Backport [https://www.virtualbox.org/ticket/19644]
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
+index c7d0d99a..2e7aa6e1 100644
+--- a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
++++ b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
+@@ -757,12 +757,19 @@ EXPORT_SYMBOL(SUPDrvLinuxIDC);
+ RTCCUINTREG VBOXCALL supdrvOSChangeCR4(RTCCUINTREG fOrMask, RTCCUINTREG fAndMask)
+ {
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
+ RTCCUINTREG uOld = this_cpu_read(cpu_tlbstate.cr4);
++#else
++ RTCCUINTREG uOld = __read_cr4();
++#endif
+ RTCCUINTREG uNew = (uOld & fAndMask) | fOrMask;
+ if (uNew != uOld)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
+ this_cpu_write(cpu_tlbstate.cr4, uNew);
+ __write_cr4(uNew);
++#endif
++ ASMSetCR4(uNew);
+ }
+ #else
+ RTCCUINTREG uOld = ASMGetCR4();
+--
+2.18.2
+
diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.8-4.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.8-4.patch
new file mode 100644
index 0000000..cb4148f
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.8-4.patch
@@ -0,0 +1,19 @@
+Description: Fix kernel 5.8 forbidding use of vermagic.h header file
+Author: Gianfranco Costamagna <locutusofborg@debian.org>
+Origin: https://www.virtualbox.org/ticket/19644
+Bug-Ubuntu: https://launchpad.net/bugs/1884652
+Last-Update: 2020-08-10
+
+--- virtualbox-6.1.12-dfsg.orig/src/VBox/Additions/linux/sharedfolders/vfsmod.c
++++ virtualbox-6.1.12-dfsg/src/VBox/Additions/linux/sharedfolders/vfsmod.c
+@@ -53,7 +53,9 @@
+ #include <linux/seq_file.h>
+ #include <linux/vfs.h>
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 62)
+-# include <linux/vermagic.h>
++# if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
++# include <linux/vermagic.h>
++# endif
+ #endif
+ #include <VBox/err.h>
+ #include <iprt/path.h>
diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.6.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.12.bb
similarity index 87%
rename from meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.6.bb
rename to meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.12.bb
index 89b1ee1..e57df58 100644
--- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.6.bb
+++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.12.bb
@@ -12,12 +12,17 @@
VBOX_NAME = "VirtualBox-${PV}"
SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
+ file://0001-fixes_for_mm_struct.patch \
+ file://0002-fixes_for_module_memory.patch \
+ file://0003-fixes_for_changes_in_cpu_tlbstate.patch \
+ file://kernel-5.8-4.patch \
file://Makefile.utils \
"
-SRC_URI[md5sum] = "fe6328d22dfb20ea372daa4b58b12374"
-SRC_URI[sha256sum] = "b031c30d770f28c5f884071ad933e8c1f83e65b93aaba03a4012077c1d90a54f"
+SRC_URI[md5sum] = "3c351f7fd6376e0bb3c8489505a9450c"
+SRC_URI[sha256sum] = "05eff0321daa72f6d00fb121a6b4211f39964778823806fa0b7b751667dec362"
-S = "${WORKDIR}/vbox_module"
+S ?= "${WORKDIR}/vbox_module"
+S_task-patch = "${WORKDIR}/${VBOX_NAME}"
export BUILD_TARGET_ARCH="${ARCH}"
export BUILD_TARGET_ARCH_x86-64="amd64"