diff options
| author | Archzfs Buildbot | 2019-03-08 01:05:28 +0000 |
|---|---|---|
| committer | Archzfs Buildbot | 2019-03-08 01:05:28 +0000 |
| commit | 3d9b7f9cc37ac0ef3370e7f9c9ab0e19892cf562 (patch) | |
| tree | b6564fed18fe51d860fd3d2de13f9f76a6c3efc3 | |
| parent | edc2de94e14796eec8146f4153e7bf1af2f64ee3 (diff) | |
| download | aur-3d9b7f9cc37ac0ef3370e7f9c9ab0e19892cf562.tar.gz | |
Semi-automated update for latest git commit
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch | 19 |
3 files changed, 7 insertions, 30 deletions
@@ -1,13 +1,13 @@ pkgbase = zfs-dkms-git pkgdesc = Kernel modules for the Zettabyte File System. - pkgver = 2019.02.28.r4983.g0409679d8 + pkgver = 2019.03.06.r4987.gbecdcec7b pkgrel = 1 url = http://zfsonlinux.org/ arch = x86_64 groups = archzfs-dkms-git license = CDDL makedepends = git - depends = zfs-utils-git=2019.02.28.r4983.g0409679d8 + depends = zfs-utils-git=2019.03.06.r4987.gbecdcec7b depends = lsb-release depends = dkms provides = zfs @@ -19,10 +19,8 @@ pkgbase = zfs-dkms-git conflicts = spl conflicts = spl-headers replaces = spl-dkms-git - source = git+https://github.com/zfsonlinux/zfs.git#commit=0409679d88a8ccd06397ceae1b6d08935198c756 - source = upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch + source = git+https://github.com/zfsonlinux/zfs.git#commit=becdcec7b9cd6b8beaa2273495b97c06de24e9e5 sha256sums = SKIP - sha256sums = 6f27c3dae57c424e06aec31df6c1e1a821e547aa4e933f2f9b894b5e6762b52d pkgname = zfs-dkms-git @@ -6,18 +6,16 @@ # http://github.com/archzfs/archzfs # pkgname="zfs-dkms-git" -_commit='0409679d88a8ccd06397ceae1b6d08935198c756' +_commit='becdcec7b9cd6b8beaa2273495b97c06de24e9e5' pkgdesc="Kernel modules for the Zettabyte File System." -pkgver=2019.02.28.r4983.g0409679d8 +pkgver=2019.03.06.r4987.gbecdcec7b pkgrel=1 makedepends=("git") arch=("x86_64") url="http://zfsonlinux.org/" -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") +source=("git+https://github.com/zfsonlinux/zfs.git#commit=${_commit}") +sha256sums=("SKIP") 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 deleted file mode 100644 index e36752293987..000000000000 --- a/upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch +++ /dev/null @@ -1,19 +0,0 @@ -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; - |