diff options
| author | Archzfs Buildbot | 2018-12-31 03:19:39 +0000 |
|---|---|---|
| committer | Archzfs Buildbot | 2018-12-31 03:19:39 +0000 |
| commit | 9eaada61c6cfd2835dd1360db117dd4564625ccd (patch) | |
| tree | 9c3e874963ea638d0ef66613cefcd15494278e16 | |
| parent | 970d79efea832361598d1e6f59e140475128bb0c (diff) | |
| download | aur-9eaada61c6cfd2835dd1360db117dd4564625ccd.tar.gz | |
Semi-automated update for kernel 4.14.90-1 + latest git commit
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch | 19 |
3 files changed, 28 insertions, 7 deletions
@@ -1,5 +1,5 @@ pkgbase = zfs-linux-lts-git - pkgver = 2018.12.18.r4869.g00f198de6_4.14.90.1 + pkgver = 2018.12.26.r4871.g06f3fc2a4_4.14.90.1 pkgrel = 1 url = http://zfsonlinux.org/ arch = x86_64 @@ -7,9 +7,9 @@ pkgbase = zfs-linux-lts-git makedepends = linux-lts-headers=4.14.90-1 makedepends = git depends = kmod - depends = zfs-utils-git=2018.12.18.r4869.g00f198de6 + depends = zfs-utils-git=2018.12.26.r4871.g06f3fc2a4 depends = linux-lts=4.14.90-1 - source = git+https://github.com/zfsonlinux/zfs.git#commit=00f198de6b6ac663926bff2666d956a61cea85db + source = git+https://github.com/zfsonlinux/zfs.git#commit=06f3fc2a4b097545259935d54634c5c6f49ed20f sha256sums = SKIP pkgname = zfs-linux-lts-git @@ -17,8 +17,8 @@ # pkgbase="zfs-linux-lts-git" pkgname=("zfs-linux-lts-git" "zfs-linux-lts-git-headers") -_commit='00f198de6b6ac663926bff2666d956a61cea85db' -_zfsver="2018.12.18.r4869.g00f198de6" +_commit='06f3fc2a4b097545259935d54634c5c6f49ed20f' +_zfsver="2018.12.26.r4871.g06f3fc2a4" _kernelver="4.14.90-1" _extramodules="4.14.90-1-lts" @@ -27,8 +27,10 @@ pkgrel=1 makedepends=("linux-lts-headers=${_kernelver}" "git") arch=("x86_64") url="http://zfsonlinux.org/" -source=("git+https://github.com/zfsonlinux/zfs.git#commit=${_commit}") -sha256sums=("SKIP") +source=("git+https://github.com/zfsonlinux/zfs.git#commit=${_commit}" + "upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch") +sha256sums=("SKIP" + "6f27c3dae57c424e06aec31df6c1e1a821e547aa4e933f2f9b894b5e6762b52d") license=("CDDL") depends=("kmod" "zfs-utils-git=${_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; + |