From 38560d1e61f8b88b4285d9bb6db7eee702a6853f Mon Sep 17 00:00:00 2001 From: John Date: Thu, 27 Sep 2018 21:17:57 +0200 Subject: [PATCH] exfat-dkms: add patch for linux4.18 resolves #3168 --- srcpkgs/exfat-dkms/patches/linux4.18.patch | 33 ++++++++++++++++++++++ srcpkgs/exfat-dkms/template | 2 +- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/exfat-dkms/patches/linux4.18.patch diff --git a/srcpkgs/exfat-dkms/patches/linux4.18.patch b/srcpkgs/exfat-dkms/patches/linux4.18.patch new file mode 100644 index 00000000000..5b337662863 --- /dev/null +++ b/srcpkgs/exfat-dkms/patches/linux4.18.patch @@ -0,0 +1,33 @@ +diff --git exfat_super.c exfat_super.c +index 312de36..262b74d 100644 +--- exfat_super.c ++++ exfat_super.c +@@ -97,6 +97,11 @@ static int exfat_default_codepage = CONFIG_EXFAT_DEFAULT_CODEPAGE; + static char exfat_default_iocharset[] = CONFIG_EXFAT_DEFAULT_IOCHARSET; + + extern struct timezone sys_tz; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,18,0) ++#define timespec_compat timespec64 ++#else ++#define timespec_compat timespec ++#endif + + #if LINUX_VERSION_CODE < KERNEL_VERSION(4,8,0) + #define current_time(x) (CURRENT_TIME_SEC) +@@ -147,7 +152,7 @@ static time_t accum_days_in_year[] = { + static void _exfat_truncate(struct inode *inode, loff_t old_size); + + /* Convert a FAT time/date pair to a UNIX date (seconds since 1 1 70). */ +-void exfat_time_fat2unix(struct exfat_sb_info *sbi, struct timespec *ts, ++void exfat_time_fat2unix(struct exfat_sb_info *sbi, struct timespec_compat *ts, + DATE_TIME_T *tp) + { + time_t year = tp->Year; +@@ -166,7 +171,7 @@ void exfat_time_fat2unix(struct exfat_sb_info *sbi, struct timespec *ts, + } + + /* Convert linear UNIX date to a FAT time/date pair. */ +-void exfat_time_unix2fat(struct exfat_sb_info *sbi, struct timespec *ts, ++void exfat_time_unix2fat(struct exfat_sb_info *sbi, struct timespec_compat *ts, + DATE_TIME_T *tp) + { diff --git a/srcpkgs/exfat-dkms/template b/srcpkgs/exfat-dkms/template index 4f64c677944..f0d28ef17df 100644 --- a/srcpkgs/exfat-dkms/template +++ b/srcpkgs/exfat-dkms/template @@ -1,7 +1,7 @@ # Template file for 'exfat-dkms' pkgname=exfat-dkms version=1.2.8 -revision=4 +revision=5 _commit=01c30ad52625a7261e1b0d874553b6ca7af25966 wrksrc="exfat-nofuse-${_commit}" short_desc="Exfat kernel driver (nofuse)"