vboxguestdrivers: Update to 5.2.18

* Fix build with 4.18 kernel

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2018-09-05 23:03:49 -07:00
parent 19246b82df
commit 791a1c612f
2 changed files with 36 additions and 3 deletions
@@ -0,0 +1,33 @@
Description: Fix build failure with new kernel 4.18
Author: Gianfranco Costamagna <locutusofborg@debian.org>
Upstream-Status:Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: vbox_module/vboxsf/utils.c
===================================================================
--- vbox_module.orig/vboxsf/utils.c
+++ vbox_module/vboxsf/utils.c
@@ -50,7 +50,11 @@ static void sf_timespec_from_ftime(RTTIM
RTTimeSpecSetNano(ts, t);
}
#else /* >= 2.6.0 */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0)
static void sf_ftime_from_timespec(struct timespec *tv, RTTIMESPEC *ts)
+#else
+static void sf_ftime_from_timespec(struct timespec64 *tv, RTTIMESPEC *ts)
+#endif
{
int64_t t = RTTimeSpecGetNano(ts);
int64_t nsec;
@@ -60,7 +64,11 @@ static void sf_ftime_from_timespec(struc
tv->tv_nsec = nsec;
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0)
static void sf_timespec_from_ftime(RTTIMESPEC *ts, struct timespec *tv)
+#else
+static void sf_timespec_from_ftime(RTTIMESPEC *ts, struct timespec64 *tv)
+#endif
{
int64_t t = (int64_t)tv->tv_nsec + (int64_t)tv->tv_sec * 1000000000;
RTTimeSpecSetNano(ts, t);
@@ -13,10 +13,10 @@ VBOX_NAME = "VirtualBox-${PV}"
SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
file://Makefile.utils \
file://kernel-4.18.patch \
"
SRC_URI[md5sum] = "e731ea9c5c31096ec4c2a3bfba26665c"
SRC_URI[sha256sum] = "ee2759d47b0b4ac81b8b671c9485c87fb2db12c097b3e7e69b94c1291a8084e8"
SRC_URI[md5sum] = "d8e291525b84569356773eef507c49ce"
SRC_URI[sha256sum] = "ed0a7efd56c7f39fae79c7ec3321473da412ef0d7914457b66f42679d513efcf"
S = "${WORKDIR}/vbox_module"