8:43 p.m.
commit 0d16ad72ff040bca647b3fb5f4e4ace5d081def4
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Feb 13 20:42:53 2019 +0000
Fixes for upcoming kernel 5.1 and update of new vboxsf
.gitignore | 1 +
0001-Fix-FTBFS-for-kernel-5.0.0-rc3.patch | 26 --------
VirtualBox-kmod.spec | 20 +++---
efc7d3081f77ad8507070beecb84fe2d3b62cd74.patch | 86 ++++++++++++++++++++++++++
sources | 2 +-
5 files changed, 101 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a45aca6..dafd410 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/master.zip
+/fb36032.zip
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index eb1762c..c543af5 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -9,6 +9,11 @@
%bcond_with newvboxsf
%endif
+# newvboxsf
+# globals for
https://github.com/jwrdegoede/vboxsf/archive/fb360320b7d5c2dc74cb958c9b27...
+%global commit1 fb360320b7d5c2dc74cb958c9b27e8708c1c9bc2
+%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
+
# Allow only root to access vboxdrv regardless of the file mode
# use only for debugging!
%bcond_without hardening
@@ -40,7 +45,7 @@
Name: VirtualBox-kmod
Version: 6.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
#Release: 1%%{?dist}
Summary: Kernel module for VirtualBox
@@ -49,9 +54,9 @@ License: GPLv2 or CDDL
URL: http://www.virtualbox.org/wiki/VirtualBox
# This filters out the XEN kernel, since we don't run on XEN
Source1: excludekernel-filter.txt
-Source2: https://github.com/jwrdegoede/vboxsf/archive/master.zip
+Source2: https://github.com/jwrdegoede/vboxsf/archive/%{shortcommit1}.zip
Patch1: Fix_compilation_of_host_modules_on_Linux_kernel_5.0.v1.patch
-Patch2: 0001-Fix-FTBFS-for-kernel-5.0.0-rc3.patch
+Patch2: efc7d3081f77ad8507070beecb84fe2d3b62cd74.patch
%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >=
%{version}%{vboxreltag}, xz, time
@@ -77,13 +82,11 @@ Kernel module for VirtualBox
tar --use-compress-program xz -xf
%{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz
pushd %{name}-%{version}
%patch1 -p2 -b .kernel_5.0
+%patch2 -p1 -b .kernel_5.1
%if %{with newvboxsf}
rm -rf vboxsf/
unzip %{SOURCE2}
-mv vboxsf-master/ vboxsf/
-pushd vboxsf
-%patch2 -p1 -b .kernel_5.0.rc3
-popd
+mv vboxsf-%{commit1}/ vboxsf/
%endif
popd
@@ -144,6 +147,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Wed Feb 13 2019 Sérgio Basto <sergio(a)serjux.com> - 6.0.4-2
+- Fixes for upcoming kernel 5.1 and update of new vboxsf
+
* Tue Jan 29 2019 Sérgio Basto <sergio(a)serjux.com> - 6.0.4-1
- Update to 6.0.4
diff --git a/efc7d3081f77ad8507070beecb84fe2d3b62cd74.patch
b/efc7d3081f77ad8507070beecb84fe2d3b62cd74.patch
new file mode 100644
index 0000000..31aac7e
--- /dev/null
+++ b/efc7d3081f77ad8507070beecb84fe2d3b62cd74.patch
@@ -0,0 +1,86 @@
+From efc7d3081f77ad8507070beecb84fe2d3b62cd74 Mon Sep 17 00:00:00 2001
+From: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>
+Date: Thu, 7 Feb 2019 15:15:22 +0000
+Subject: [PATCH] Drivers/Linux: fixes for upcoming Linux 5.1 kernel.
+ bugref:4567: Linux kernel driver maintenance. Linux 5.1 moves MAP_SHARED to
+ uapi/linux/mman.h. Thank you Valdis Kletnieks.
+
+git-svn-id: http://www.virtualbox.org/svn/vbox@77198
cfe28804-0f27-0410-a406-dd0f0b0b656f
+---
+ trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
b/trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+index e7c75ec677..de22ee6cd6 100644
+--- ./vboxnetflt/r0drv/linux/the-linux-kernel.h
++++ ./vboxnetflt/r0drv/linux/the-linux-kernel.h
+@@ -128,6 +128,9 @@
+ # include <linux/cpu.h>
+ # include <linux/notifier.h>
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
++# include <uapi/linux/mman.h>
++#endif
+ /* For the basic additions module */
+ #include <linux/pci.h>
+ #include <linux/delay.h>
+--- ./vboxguest/r0drv/linux/the-linux-kernel.h
++++ ./vboxguest/r0drv/linux/the-linux-kernel.h
+@@ -128,6 +128,9 @@
+ # include <linux/cpu.h>
+ # include <linux/notifier.h>
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
++# include <uapi/linux/mman.h>
++#endif
+ /* For the basic additions module */
+ #include <linux/pci.h>
+ #include <linux/delay.h>
+--- ./vboxdrv/r0drv/linux/the-linux-kernel.h
++++ ./vboxdrv/r0drv/linux/the-linux-kernel.h
+@@ -128,6 +128,9 @@
+ # include <linux/cpu.h>
+ # include <linux/notifier.h>
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
++# include <uapi/linux/mman.h>
++#endif
+ /* For the basic additions module */
+ #include <linux/pci.h>
+ #include <linux/delay.h>
+--- ./vboxpci/r0drv/linux/the-linux-kernel.h
++++ ./vboxpci/r0drv/linux/the-linux-kernel.h
+@@ -128,6 +128,9 @@
+ # include <linux/cpu.h>
+ # include <linux/notifier.h>
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
++# include <uapi/linux/mman.h>
++#endif
+ /* For the basic additions module */
+ #include <linux/pci.h>
+ #include <linux/delay.h>
+--- ./vboxsf/r0drv/linux/the-linux-kernel.h
++++ ./vboxsf/r0drv/linux/the-linux-kernel.h
+@@ -128,6 +128,9 @@
+ # include <linux/cpu.h>
+ # include <linux/notifier.h>
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
++# include <uapi/linux/mman.h>
++#endif
+ /* For the basic additions module */
+ #include <linux/pci.h>
+ #include <linux/delay.h>
+--- ./vboxnetadp/r0drv/linux/the-linux-kernel.h
++++ ./vboxnetadp/r0drv/linux/the-linux-kernel.h
+@@ -128,6 +128,9 @@
+ # include <linux/cpu.h>
+ # include <linux/notifier.h>
+ #endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
++# include <uapi/linux/mman.h>
++#endif
+ /* For the basic additions module */
+ #include <linux/pci.h>
+ #include <linux/delay.h>
diff --git a/sources b/sources
index e95182d..15d2646 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a91d18197f3f0b46120899ec38acf4ea master.zip
+a2346e84a310259c4877b577ea0d93dc fb36032.zip