commit 40f66d76f1e56cd3b4fcaf5a00399916d4e3390b Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Fri Mar 22 14:24:30 2019 +0000 Rebase and squash el7 .gitignore | 1 + ...on_of_host_modules_on_Linux_kernel_5.0.v1.patch | 12 ++ VirtualBox-kmod.spec | 44 ++++++-- changeset_75402.diff | 125 --------------------- efc7d3081f77ad8507070beecb84fe2d3b62cd74.patch | 86 ++++++++++++++ ...dekernel-filter.txt => excludekernel-filter.txt | 0 sources | 2 +- 7 files changed, 132 insertions(+), 138 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/Fix_compilation_of_host_modules_on_Linux_kernel_5.0.v1.patch b/Fix_compilation_of_host_modules_on_Linux_kernel_5.0.v1.patch new file mode 100644 index 0000000..bd80c59 --- /dev/null +++ b/Fix_compilation_of_host_modules_on_Linux_kernel_5.0.v1.patch @@ -0,0 +1,12 @@ +--- ./VirtualBox-kmod-6.0.2/vboxsf/vfsmod.c.orig 2019-01-27 03:29:18.138159346 +0000 ++++ ./VirtualBox-kmod-6.0.2/vboxsf/vfsmod.c 2019-01-27 03:54:08.850764196 +0000 +@@ -43,6 +43,9 @@ + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) + # include <linux/mount.h> + #endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0) ++# include <uapi/linux/mount.h> ++#endif + #include <linux/seq_file.h> + + MODULE_DESCRIPTION(VBOX_PRODUCT " VFS Module for Host File System Access"); diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec index f14736a..7cf67b2 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 @@ -31,26 +36,28 @@ # major version number, while the kernel module abi is not guaranteed # to be stable. This is so that we force the module update in sync with # userspace. -#global prerel 106108 -%global prereltag %{?prerel:-%(awk 'BEGIN {print toupper("%{prerel}")}')} +#global prerel RC1 +%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')} %global vboxrel 1 %global vboxreltag %{?vboxrel:-%{vboxrel}} %global __arch_install_post /usr/lib/rpm/check-rpaths /usr/lib/rpm/check-buildroot Name: VirtualBox-kmod -Version: 5.2.24 -#Release: 1%%{?prerel:.%%{prerel}}%%{?dist} -Release: 1%{?dist} +Version: 6.0.4 +Release: 3%{?dist} +#Release: 1%%{?dist} Summary: Kernel module for VirtualBox +Group: System Environment/Kernel 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: VirtualBox-kmod-excludekernel-filter.txt -Source2: https://github.com/jwrdegoede/vboxsf/archive/master.zip +Source1: excludekernel-filter.txt +Source2: https://github.com/jwrdegoede/vboxsf/archive/%{shortcommit1}.zip +Patch1: Fix_compilation_of_host_modules_on_Linux_kernel_5.0.v1.patch +Patch2: efc7d3081f77ad8507070beecb84fe2d3b62cd74.patch -#Patch1: changeset_75402.diff %global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time BuildRequires: %{AkmodsBuildRequires} @@ -74,11 +81,12 @@ Kernel module for VirtualBox %setup -T -c tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz pushd %{name}-%{version} -#patch1 -p1 -b .rhel76_fix +%patch1 -p2 -b .kernel_5.0 +%patch2 -p1 -b .kernel_5.1 %if %{with newvboxsf} rm -rf vboxsf/ unzip %{SOURCE2} -mv vboxsf-master/ vboxsf/ +mv vboxsf-%{commit1}/ vboxsf/ %endif popd @@ -139,8 +147,20 @@ DIRS=$(ls %{name}-%{version} |wc -l) %changelog -* Mon Jan 21 2019 Sérgio Basto <sergio(a)serjux.com&gt; - 5.2.24-1 -- Update to 5.2.24 +* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 6.0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Feb 13 2019 Sérgio Basto <sergio(a)serjux.com&gt; - 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&gt; - 6.0.4-1 +- Update to 6.0.4 + +* Thu Jan 17 2019 Vasiliy N. Glazov <vascom2(a)gmail.com&gt; - 6.0.2-1 +- Update to 6.0.2 + +* Wed Dec 19 2018 Sérgio Basto <sergio(a)serjux.com&gt; - 6.0.0-1 +- VirtualBox 6.0 * Thu Dec 13 2018 Sérgio Basto <sergio(a)serjux.com&gt; - 5.2.22-3 - Fix vboxvideo.ko build on rhel76 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/VirtualBox-kmod-excludekernel-filter.txt b/excludekernel-filter.txt similarity index 100% rename from VirtualBox-kmod-excludekernel-filter.txt rename to excludekernel-filter.txt diff --git a/sources b/sources index e95182d..15d2646 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a91d18197f3f0b46120899ec38acf4ea master.zip +a2346e84a310259c4877b577ea0d93dc fb36032.zip