diff options
| author | Archzfs Buildbot | 2018-12-31 03:19:35 +0000 |
|---|---|---|
| committer | Archzfs Buildbot | 2018-12-31 03:19:35 +0000 |
| commit | cb7fde6e37abe3b85306e09667e2889ccf427c28 (patch) | |
| tree | 5ec89d20e9dff4940baf38c7bdad60c844c1acae | |
| parent | 55df2242ee81945ea7db647b9c70f21c68b7a9b7 (diff) | |
| download | aur-cb7fde6e37abe3b85306e09667e2889ccf427c28.tar.gz | |
Semi-automated update for kernel 4.14.90-1 + zfs 0.8.0-rc2
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch | 19 |
2 files changed, 23 insertions, 2 deletions
@@ -26,8 +26,10 @@ pkgrel=1 makedepends=("linux-lts-headers=${_kernelver}") arch=("x86_64") url="http://zfsonlinux.org/" -source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${_zfsver/_/-}/zfs-${_zfsver/_/-}.tar.gz") -sha256sums=("66fa2aa270586dc3c0f64d08b83f126f288163d6fb622e8d85e3e86a118a2082") +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=("66fa2aa270586dc3c0f64d08b83f126f288163d6fb622e8d85e3e86a118a2082" + "6f27c3dae57c424e06aec31df6c1e1a821e547aa4e933f2f9b894b5e6762b52d") license=("CDDL") depends=("kmod" "zfs-utils-rc=${_zfsver}" "linux-lts=${_kernelver}") 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; + |