[VirtualBox-kmod] Add fixes-for-5.15

commit 28039142fef257b721459b96e2dd4b67f851aeb7 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Mon Sep 13 13:15:47 2021 +0100 Add fixes-for-5.15 VirtualBox-kmod.spec | 8 +++-- fixes-for-5.15_fedora.patch | 85 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 2 deletions(-) --- diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec index 98a8e22..c0c2e3c 100644 --- a/VirtualBox-kmod.spec +++ b/VirtualBox-kmod.spec @@ -32,7 +32,7 @@ Name: VirtualBox-kmod Version: 6.1.26 -Release: 1%{?dist} +Release: 2%{?dist} #Release: 1%%{?prerel:.%%{prerel}}%%{?dist} Summary: Kernel module for VirtualBox @@ -40,6 +40,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: excludekernel-filter.txt +Patch1: fixes-for-5.15_fedora.patch %global AkmodsBuildRequires %{_bindir}/kmodtool VirtualBox-kmodsrc >= %{version}%{vboxreltag} xz time elfutils-libelf-devel gcc @@ -61,7 +62,7 @@ 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 +%patch1 -p1 popd # error out if there was something wrong with kmodtool @@ -125,6 +126,9 @@ DIRS=$(ls %{name}-%{version} |wc -l) %changelog +* Mon Sep 13 2021 Sérgio Basto <sergio(a)serjux.com&gt; - 6.1.26-2 +- Add fixes-for-5.15 + * Mon Aug 09 2021 Sérgio Basto <sergio(a)serjux.com&gt; - 6.1.26-1 - Update to 6.1.26 diff --git a/fixes-for-5.15_fedora.patch b/fixes-for-5.15_fedora.patch new file mode 100644 index 0000000..638d2ef --- /dev/null +++ b/fixes-for-5.15_fedora.patch @@ -0,0 +1,85 @@ +diff -rup VirtualBox-kmod-6.1.26.orig/vboxdrv/include/iprt/stdarg.h VirtualBox-kmod-6.1.26/vboxdrv/include/iprt/stdarg.h +--- VirtualBox-kmod-6.1.26.orig/vboxdrv/include/iprt/stdarg.h 2021-07-28 17:13:57.000000000 +0100 ++++ VirtualBox-kmod-6.1.26/vboxdrv/include/iprt/stdarg.h 2021-09-13 13:04:24.536235200 +0100 +@@ -44,7 +44,12 @@ + # define __builtin_stdarg_start __builtin_va_start + # endif + # else +-# include <stdarg.h> ++# include <linux/version.h> ++# if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0) ++# include <stdarg.h> ++# else ++# include <linux/stdarg.h> ++# endif + # endif + #endif + +diff -rup VirtualBox-kmod-6.1.26.orig/vboxguest/include/iprt/stdarg.h VirtualBox-kmod-6.1.26/vboxguest/include/iprt/stdarg.h +--- VirtualBox-kmod-6.1.26.orig/vboxguest/include/iprt/stdarg.h 2021-07-28 17:13:57.000000000 +0100 ++++ VirtualBox-kmod-6.1.26/vboxguest/include/iprt/stdarg.h 2021-09-13 13:04:10.801129474 +0100 +@@ -44,7 +44,12 @@ + # define __builtin_stdarg_start __builtin_va_start + # endif + # else +-# include <stdarg.h> ++# include <linux/version.h> ++# if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0) ++# include <stdarg.h> ++# else ++# include <linux/stdarg.h> ++# endif + # endif + #endif + +diff -rup VirtualBox-kmod-6.1.26.orig/vboxnetadp/include/iprt/stdarg.h VirtualBox-kmod-6.1.26/vboxnetadp/include/iprt/stdarg.h +--- VirtualBox-kmod-6.1.26.orig/vboxnetadp/include/iprt/stdarg.h 2021-07-28 17:13:57.000000000 +0100 ++++ VirtualBox-kmod-6.1.26/vboxnetadp/include/iprt/stdarg.h 2021-09-13 13:04:05.972092303 +0100 +@@ -44,7 +44,12 @@ + # define __builtin_stdarg_start __builtin_va_start + # endif + # else +-# include <stdarg.h> ++# include <linux/version.h> ++# if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0) ++# include <stdarg.h> ++# else ++# include <linux/stdarg.h> ++# endif + # endif + #endif + +diff -rup VirtualBox-kmod-6.1.26.orig/vboxnetflt/include/iprt/stdarg.h VirtualBox-kmod-6.1.26/vboxnetflt/include/iprt/stdarg.h +--- VirtualBox-kmod-6.1.26.orig/vboxnetflt/include/iprt/stdarg.h 2021-07-28 17:13:57.000000000 +0100 ++++ VirtualBox-kmod-6.1.26/vboxnetflt/include/iprt/stdarg.h 2021-09-13 13:04:17.661182279 +0100 +@@ -44,7 +44,12 @@ + # define __builtin_stdarg_start __builtin_va_start + # endif + # else +-# include <stdarg.h> ++# include <linux/version.h> ++# if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0) ++# include <stdarg.h> ++# else ++# include <linux/stdarg.h> ++# endif + # endif + #endif + +diff -rup VirtualBox-kmod-6.1.26.orig/vboxsf/include/iprt/stdarg.h VirtualBox-kmod-6.1.26/vboxsf/include/iprt/stdarg.h +--- VirtualBox-kmod-6.1.26.orig/vboxsf/include/iprt/stdarg.h 2021-07-28 17:13:57.000000000 +0100 ++++ VirtualBox-kmod-6.1.26/vboxsf/include/iprt/stdarg.h 2021-09-13 13:04:30.755283071 +0100 +@@ -44,7 +44,12 @@ + # define __builtin_stdarg_start __builtin_va_start + # endif + # else +-# include <stdarg.h> ++# include <linux/version.h> ++# if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0) ++# include <stdarg.h> ++# else ++# include <linux/stdarg.h> ++# endif + # endif + #endif +