[VirtualBox-kmod] Applied upstream patch for kernel-4.10.0-0.rc5

commit 52fe386f2faa239e46ac140d959c8a957073cc53 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Fri Jan 27 14:15:35 2017 +0000 Applied upstream patch for kernel-4.10.0-0.rc5 VirtualBox-kmod.spec | 7 +++++-- kernel-4.10.0-0.rc5.lnkops.patch | 17 ----------------- kernel-4.10.0-0.rc5.lnkops.v2.patch | 24 ++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 19 deletions(-) --- diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec index e0998be..b18ad95 100644 --- a/VirtualBox-kmod.spec +++ b/VirtualBox-kmod.spec @@ -28,7 +28,7 @@ Name: VirtualBox-kmod Version: 5.1.14 #Release: 1%%{?prerel:.%%{prerel}}%%{?dist} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Kernel module for VirtualBox Group: System Environment/Kernel @@ -36,7 +36,7 @@ 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 -Patch1: kernel-4.10.0-0.rc5.lnkops.patch +Patch1: kernel-4.10.0-0.rc5.lnkops.v2.patch %global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time BuildRequires: %{AkmodsBuildRequires} @@ -108,6 +108,9 @@ DIRS=$(ls %{name}-%{version} |wc -l) %changelog +* Fri Jan 27 2017 Sérgio Basto <sergio(a)serjux.com&gt; - 5.1.14-3 +- Applied upstream patch for kernel-4.10.0-0.rc5 + * Fri Jan 27 2017 Sérgio Basto <sergio(a)serjux.com&gt; - 5.1.14-2 - Applied lnkops.patch for kernel-4.10.0-0.rc5 diff --git a/kernel-4.10.0-0.rc5.lnkops.v2.patch b/kernel-4.10.0-0.rc5.lnkops.v2.patch new file mode 100644 index 0000000..22279ff --- /dev/null +++ b/kernel-4.10.0-0.rc5.lnkops.v2.patch @@ -0,0 +1,24 @@ +From d9bd947b1fa1d7c47cd1cdb894dadfa07f51e446 Mon Sep 17 00:00:00 2001 +From: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> +Date: Tue, 24 Jan 2017 08:13:25 +0000 +Subject: [PATCH] Additions/linux/sharedfolders: Linux 4.10 fix + +git-svn-id: http://www.virtualbox.org/svn/vbox@65409 cfe28804-0f27-0410-a406-dd0f0b0b656f +--- + trunk/src/VBox/Additions/linux/sharedfolders/lnkops.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/trunk/src/VBox/Additions/linux/sharedfolders/lnkops.c b/trunk/src/VBox/Additions/linux/sharedfolders/lnkops.c +index 66ddecd..e43b84c 100644 +--- ./VirtualBox-kmod-5.1.14/vboxsf/lnkops.c.orig ++++ ./VirtualBox-kmod-5.1.14/vboxsf/lnkops.c +@@ -90,7 +90,9 @@ static const char *sf_get_link(struct dentry *dentry, struct inode *inode, + + struct inode_operations sf_lnk_iops = + { ++# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) + .readlink = generic_readlink, ++# endif + # if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) + .get_link = sf_get_link + # elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)