diff options
| author | Archzfs Buildbot | 2018-12-31 03:19:31 +0000 |
|---|---|---|
| committer | Archzfs Buildbot | 2018-12-31 03:19:31 +0000 |
| commit | 236990e5100f559e988d92a7f827338d6c2a944a (patch) | |
| tree | 332e6e6f5aeaa7e8948e94df9e12b9eebc8600e1 | |
| parent | 1591a06bc4169e794249ac6f7cc616213950b3ed (diff) | |
| download | aur-236990e5100f559e988d92a7f827338d6c2a944a.tar.gz | |
Semi-automated update for kernel 4.14.90-1 + zfs 0.7.12
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch | 19 |
2 files changed, 27 insertions, 2 deletions
@@ -26,10 +26,16 @@ pkgrel=2 makedepends=("linux-lts-headers=${_kernelver}" "spl-linux-lts-headers") arch=("x86_64") url="http://zfsonlinux.org/" -source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${_zfsver}/zfs-${_zfsver}.tar.gz") -sha256sums=("720e3b221c1ba5d4c18c990e48b86a2eb613575a0c3cc84c0aa784b17b7c2848") +source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${_zfsver}/zfs-${_zfsver}.tar.gz" + "upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch") +sha256sums=("720e3b221c1ba5d4c18c990e48b86a2eb613575a0c3cc84c0aa784b17b7c2848" + "6f27c3dae57c424e06aec31df6c1e1a821e547aa4e933f2f9b894b5e6762b52d") license=("CDDL") depends=("kmod" 'spl-linux-lts' "zfs-utils=${_zfsver}" "linux-lts=${_kernelver}") +prepare() { + cd "${srcdir}/zfs-${_zfsver}" + patch -Np1 -i ${srcdir}/upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch +} build() { cd "${srcdir}/zfs-${_zfsver}" diff --git a/upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch b/upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch new file mode 100644 index 000000000000..e36752293987 --- /dev/null +++ b/upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch @@ -0,0 +1,19 @@ +diff --git a/include/zpios-ctl.h b/include/zpios-ctl.h +index f17f1153260..068c9eaf173 100644 +--- a/include/zpios-ctl.h ++++ b/include/zpios-ctl.h +@@ -181,9 +181,12 @@ zpios_timespec_t + zpios_timespec_now(void) + { + zpios_timespec_t zts_now; +- struct timespec ts_now; ++ #if defined(HAVE_INODE_TIMESPEC64_TIMES) ++ inode_timespec_t ts_now = current_kernel_time64(); ++ #else ++ inode_timespec_t ts_now = current_kernel_time(); ++ #endif + +- ts_now = current_kernel_time(); + zts_now.ts_sec = ts_now.tv_sec; + zts_now.ts_nsec = ts_now.tv_nsec; + |