diff options
| author | Archzfs Buildbot | 2018-12-31 03:20:29 +0000 |
|---|---|---|
| committer | Archzfs Buildbot | 2018-12-31 03:20:29 +0000 |
| commit | 071e1b4ef1b5c3480dabaeda7bf62ef3b5b8f460 (patch) | |
| tree | 1fa7c6cf11ba29207a3256947f822f9df6955be9 | |
| parent | 836c4fb0dea6985e4d09fb5ef1e5179ade8c7e3d (diff) | |
| download | aur-071e1b4ef1b5c3480dabaeda7bf62ef3b5b8f460.tar.gz | |
Semi-automated update for 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,13 +1,13 @@ pkgbase = zfs-dkms-git pkgdesc = Kernel modules for the Zettabyte File System. - pkgver = 2018.12.18.r4869.g00f198de6 + pkgver = 2018.12.26.r4871.g06f3fc2a4 pkgrel = 1 url = http://zfsonlinux.org/ arch = x86_64 groups = archzfs-dkms-git license = CDDL makedepends = git - depends = zfs-utils-git=2018.12.18.r4869.g00f198de6 + depends = zfs-utils-git=2018.12.26.r4871.g06f3fc2a4 depends = lsb-release depends = dkms provides = zfs @@ -19,7 +19,7 @@ pkgbase = zfs-dkms-git conflicts = spl conflicts = spl-headers replaces = spl-dkms-git - source = git+https://github.com/zfsonlinux/zfs.git#commit=00f198de6b6ac663926bff2666d956a61cea85db + source = git+https://github.com/zfsonlinux/zfs.git#commit=06f3fc2a4b097545259935d54634c5c6f49ed20f sha256sums = SKIP pkgname = zfs-dkms-git @@ -6,16 +6,18 @@ # http://github.com/archzfs/archzfs # pkgname="zfs-dkms-git" -_commit='00f198de6b6ac663926bff2666d956a61cea85db' +_commit='06f3fc2a4b097545259935d54634c5c6f49ed20f' pkgdesc="Kernel modules for the Zettabyte File System." -pkgver=2018.12.18.r4869.g00f198de6 +pkgver=2018.12.26.r4871.g06f3fc2a4 pkgrel=1 makedepends=("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=("zfs-utils-git=${pkgver}" "lsb-release" "dkms") provides=("zfs" "zfs-headers" "spl" "spl-headers") 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; + |