diff --git a/fixes_for_5.6.patch b/fixes_for_5.6.patch index a731002..934b2fc 100644 --- a/fixes_for_5.6.patch +++ b/fixes_for_5.6.patch @@ -49,11 +49,11 @@ Index: VirtualBox-6.1.2/include/iprt/time.h + * time handling macros were hidden. Thus, user- and kernel-space + * names are different. + */ -+#include +#include +#include +#include +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) ++#include +#define timespec __kernel_old_timespec +#define ktime_get_ts ktime_get_ts64 +#undef time_t diff --git a/virtualbox.changes b/virtualbox.changes index 2ce8b1d..067fdbc 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -9,6 +9,13 @@ Thu Apr 9 21:49:36 UTC 2020 - Larry Finger - Makefile in the kernel-host-source package has a typo bug fixed (boo#1168910) and a large number of warnings are fixed. +------------------------------------------------------------------- +Sun Apr 5 18:05:53 UTC 2020 - Hans-Peter Jansen + +- apply fixes for kernel 5.6 unconditionally +- adjust fixes_for_5.6.patch in such a way, it can be applied unconditionally + (in order to support builds for newer kernel with older distributions) + ------------------------------------------------------------------- Sun Mar 29 19:20:48 UTC 2020 - Larry Finger diff --git a/virtualbox.spec b/virtualbox.spec index 7c9e9ec..9677c30 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -462,9 +462,7 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL. %endif %patch133 -p1 %patch134 -p1 -%if 0%{?suse_version} > 1500 %patch135 -p1 -%endif %patch136 -p1 %patch137 -p1 %patch138 -p1