commit fd696aa5da8c878b43ba09e91f8dc94af311d3b5
Author: Jan Palus <[email protected]>
Date: Fri Mar 8 01:14:31 2019 +0100
upstream patch to fix build against kernel 5.0; rel 2
VirtualBox.spec | 4 +++-
kernel-5.0.patch | 22 ++++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index f9a9565..f34fb9a 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -42,7 +42,7 @@ exit 1
%define qtver 5.6.0
-%define rel 1
+%define rel 2
%define pname VirtualBox
Summary: VirtualBox - x86 hardware virtualizer
Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86
@@ -83,6 +83,7 @@ Patch14: %{pname}-multipython.patch
Patch15: %{pname}-lightdm-1.19.2.patch
Patch16: %{pname}-no-vboxvideo.patch
Patch17: kernel-4.4.169.patch
+Patch18: kernel-5.0.patch
URL: http://www.virtualbox.org/
%if %{with userspace}
%ifarch %{x8664}
@@ -551,6 +552,7 @@ cd ../..\
%patch14 -p0
%patch15 -p0
%patch16 -p0
+%patch18 -p0
%{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
-e 's/Categories=.*/Categories=Utility;Emulator;/'
src/VBox/Installer/common/virtualbox.desktop.in
diff --git a/kernel-5.0.patch b/kernel-5.0.patch
new file mode 100644
index 0000000..5ac22fd
--- /dev/null
+++ b/kernel-5.0.patch
@@ -0,0 +1,22 @@
+------------------------------------------------------------------------
+r77542 | vboxsync | 2019-03-03 05:40:17 +0100 (nie, 03 mar 2019) | 1 line
+
+linux/vboxsf: MS_REMOUNT and friends moved to uapi/linux/mount.h in 5.0 (rc8),
so we need to include it to use it. bugref:9172
+
+Index: src/VBox/Additions/linux/sharedfolders/vfsmod.c
+===================================================================
+--- src/VBox/Additions/linux/sharedfolders/vfsmod.c (revision 77541)
++++ src/VBox/Additions/linux/sharedfolders/vfsmod.c (revision 77542)
+@@ -45,7 +45,9 @@
+ #include "revision-generated.h"
+ #include "product-generated.h"
+ #include "VBoxGuestR0LibInternal.h"
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
++# include <uapi/linux/mount.h> /* for MS_REMOUNT */
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
+ # include <linux/mount.h>
+ #endif
+ #include <linux/seq_file.h>
+
+------------------------------------------------------------------------
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/fd696aa5da8c878b43ba09e91f8dc94af311d3b5
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
