commit 2efdc6bfc1a4c7f8419f5862e084bad340a1c9f1 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Tue Jan 29 04:39:05 2019 +0000 Update to 6.0.4 0001-Fix-FTBFS-for-kernel-5.0.0-rc3.patch | 26 +++++ ...on_of_host_modules_on_Linux_kernel_5.0.v1.patch | 12 ++ VirtualBox-kmod.spec | 14 ++- changeset_75402.diff | 125 --------------------- fixes_for_4.17.patch | 29 ----- 5 files changed, 49 insertions(+), 157 deletions(-) --- diff --git a/0001-Fix-FTBFS-for-kernel-5.0.0-rc3.patch b/0001-Fix-FTBFS-for-kernel-5.0.0-rc3.patch new file mode 100644 index 0000000..dff74ba --- /dev/null +++ b/0001-Fix-FTBFS-for-kernel-5.0.0-rc3.patch @@ -0,0 +1,26 @@ +From d1860de35252ec91f03d1f32618ee147cda14eac Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio(a)serjux.com&gt; +Date: Tue, 29 Jan 2019 04:06:03 +0000 +Subject: [PATCH] Fix FTBFS for kernel 5.0.0-rc3 + +--- + vfsmod.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/vfsmod.h b/vfsmod.h +index 20efcb7..b0c257c 100644 +--- a/vfsmod.h ++++ b/vfsmod.h +@@ -10,6 +10,9 @@ + + #include <linux/backing-dev.h> + #include <linux/version.h> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0) ++# include <uapi/linux/mount.h> ++#endif + #include "shfl_hostintf.h" + + #define DIR_BUFFER_SIZE SZ_16K +-- +2.17.2 + 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 02309db..eb1762c 100644 --- a/VirtualBox-kmod.spec +++ b/VirtualBox-kmod.spec @@ -39,8 +39,8 @@ %global __arch_install_post /usr/lib/rpm/check-rpaths /usr/lib/rpm/check-buildroot Name: VirtualBox-kmod -Version: 6.0.2 -Release: 1%{?prerel:.%{prerel}}%{?dist} +Version: 6.0.4 +Release: 1%{?dist} #Release: 1%%{?dist} Summary: Kernel module for VirtualBox @@ -50,6 +50,8 @@ 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 +Patch1: Fix_compilation_of_host_modules_on_Linux_kernel_5.0.v1.patch +Patch2: 0001-Fix-FTBFS-for-kernel-5.0.0-rc3.patch %global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time @@ -74,11 +76,14 @@ Kernel module for VirtualBox %setup -T -c tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz pushd %{name}-%{version} -#patch1 -p2 -b .kernel_4.18 +%patch1 -p2 -b .kernel_5.0 %if %{with newvboxsf} rm -rf vboxsf/ unzip %{SOURCE2} mv vboxsf-master/ vboxsf/ +pushd vboxsf +%patch2 -p1 -b .kernel_5.0.rc3 +popd %endif popd @@ -139,6 +144,9 @@ DIRS=$(ls %{name}-%{version} |wc -l) %changelog +* 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