[VirtualBox-kmod] Fix for kernel 5.4-rc3

commit fb62b8e052f0bc7031272d24838b79d5d237b403 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Mon Oct 21 17:30:25 2019 +0100 Fix for kernel 5.4-rc3 VirtualBox-kmod.spec | 7 +++++- fixes_for_5.4-rc3.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 1 deletion(-) --- diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec index 08b701b..bb0fcae 100644 --- a/VirtualBox-kmod.spec +++ b/VirtualBox-kmod.spec @@ -45,7 +45,7 @@ Name: VirtualBox-kmod Version: 6.0.14 -Release: 1%{?dist} +Release: 2%{?dist} #Release: 1%%{?prerel:.%%{prerel}}%%{?dist} Summary: Kernel module for VirtualBox @@ -57,6 +57,7 @@ Source1: excludekernel-filter.txt Source2: https://github.com/jwrdegoede/vboxsf/archive/%{shortcommit1}.zip Patch2: kernel-5.patch Patch4: fixes_for_5.4.patch +Patch5: fixes_for_5.4-rc3.patch %global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time @@ -83,6 +84,7 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi pushd %{name}-%{version} %patch2 -p1 +%patch5 -p1 %if %{with newvboxsf} rm -rf vboxsf/ unzip %{SOURCE2} @@ -150,6 +152,9 @@ DIRS=$(ls %{name}-%{version} |wc -l) %changelog +* Sun Oct 20 2019 Sérgio Basto <sergio(a)serjux.com&gt; - 6.0.14-2 +- Fix for kernel 5.4-rc3 + * Thu Oct 17 2019 Sérgio Basto <sergio(a)serjux.com&gt; - 6.0.14-1 - Update VBox to 6.0.14 diff --git a/fixes_for_5.4-rc3.patch b/fixes_for_5.4-rc3.patch new file mode 100644 index 0000000..15af263 --- /dev/null +++ b/fixes_for_5.4-rc3.patch @@ -0,0 +1,66 @@ +--- VirtualBox-kmod-6.0.14/vboxnetflt/include/iprt/cdefs.h.orig 2019-10-20 22:03:59.361724808 +0100 ++++ VirtualBox-kmod-6.0.14/vboxnetflt/include/iprt/cdefs.h 2019-10-20 22:04:16.057917186 +0100 +@@ -1166,7 +1166,7 @@ + * Tell the compiler that we're falling through to the next case in a switch. + * @sa RT_FALL_THRU */ + #if RT_GNUC_PREREQ(7, 0) +-# define RT_FALL_THROUGH() __attribute__((fallthrough)) ++# define RT_FALL_THROUGH() __attribute__((__fallthrough__)) + #else + # define RT_FALL_THROUGH() (void)0 + #endif +--- VirtualBox-kmod-6.0.14/vboxguest/include/iprt/cdefs.h.orig 2019-10-20 22:03:59.361724808 +0100 ++++ VirtualBox-kmod-6.0.14/vboxguest/include/iprt/cdefs.h 2019-10-20 22:04:16.057917186 +0100 +@@ -1166,7 +1166,7 @@ + * Tell the compiler that we're falling through to the next case in a switch. + * @sa RT_FALL_THRU */ + #if RT_GNUC_PREREQ(7, 0) +-# define RT_FALL_THROUGH() __attribute__((fallthrough)) ++# define RT_FALL_THROUGH() __attribute__((__fallthrough__)) + #else + # define RT_FALL_THROUGH() (void)0 + #endif +--- VirtualBox-kmod-6.0.14/vboxdrv/include/iprt/cdefs.h.orig 2019-10-20 22:03:59.361724808 +0100 ++++ VirtualBox-kmod-6.0.14/vboxdrv/include/iprt/cdefs.h 2019-10-20 22:04:16.057917186 +0100 +@@ -1166,7 +1166,7 @@ + * Tell the compiler that we're falling through to the next case in a switch. + * @sa RT_FALL_THRU */ + #if RT_GNUC_PREREQ(7, 0) +-# define RT_FALL_THROUGH() __attribute__((fallthrough)) ++# define RT_FALL_THROUGH() __attribute__((__fallthrough__)) + #else + # define RT_FALL_THROUGH() (void)0 + #endif +--- VirtualBox-kmod-6.0.14/vboxpci/include/iprt/cdefs.h.orig 2019-10-20 22:03:59.361724808 +0100 ++++ VirtualBox-kmod-6.0.14/vboxpci/include/iprt/cdefs.h 2019-10-20 22:04:16.057917186 +0100 +@@ -1166,7 +1166,7 @@ + * Tell the compiler that we're falling through to the next case in a switch. + * @sa RT_FALL_THRU */ + #if RT_GNUC_PREREQ(7, 0) +-# define RT_FALL_THROUGH() __attribute__((fallthrough)) ++# define RT_FALL_THROUGH() __attribute__((__fallthrough__)) + #else + # define RT_FALL_THROUGH() (void)0 + #endif +--- VirtualBox-kmod-6.0.14/vboxsf/include/iprt/cdefs.h.orig 2019-10-20 22:03:59.361724808 +0100 ++++ VirtualBox-kmod-6.0.14/vboxsf/include/iprt/cdefs.h 2019-10-20 22:04:16.057917186 +0100 +@@ -1166,7 +1166,7 @@ + * Tell the compiler that we're falling through to the next case in a switch. + * @sa RT_FALL_THRU */ + #if RT_GNUC_PREREQ(7, 0) +-# define RT_FALL_THROUGH() __attribute__((fallthrough)) ++# define RT_FALL_THROUGH() __attribute__((__fallthrough__)) + #else + # define RT_FALL_THROUGH() (void)0 + #endif +--- VirtualBox-kmod-6.0.14/vboxnetadp/include/iprt/cdefs.h.orig 2019-10-20 22:03:59.361724808 +0100 ++++ VirtualBox-kmod-6.0.14/vboxnetadp/include/iprt/cdefs.h 2019-10-20 22:04:16.057917186 +0100 +@@ -1166,7 +1166,7 @@ + * Tell the compiler that we're falling through to the next case in a switch. + * @sa RT_FALL_THRU */ + #if RT_GNUC_PREREQ(7, 0) +-# define RT_FALL_THROUGH() __attribute__((fallthrough)) ++# define RT_FALL_THROUGH() __attribute__((__fallthrough__)) + #else + # define RT_FALL_THROUGH() (void)0 + #endif