diff options
| -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,18 +1,16 @@ pkgbase = zfs-linux-lts-rc - pkgver = 0.8.0_rc3_4.19.26.1 + pkgver = 0.8.0_rc3_4.19.27.1 pkgrel = 1 url = http://zfsonlinux.org/ arch = x86_64 license = CDDL - makedepends = linux-lts-headers=4.19.26-1 + makedepends = linux-lts-headers=4.19.27-1 makedepends = python depends = kmod depends = zfs-utils-rc=0.8.0_rc3 - depends = linux-lts=4.19.26-1 + depends = linux-lts=4.19.27-1 source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.0-rc3/zfs-0.8.0-rc3.tar.gz - source = upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch sha256sums = 5c344d6ff876d4c5286d83745700127054858cea379d31741fe96589ac40baff - sha256sums = 6f27c3dae57c424e06aec31df6c1e1a821e547aa4e933f2f9b894b5e6762b52d pkgname = zfs-linux-lts-rc pkgdesc = Kernel modules for the Zettabyte File System. @@ -18,18 +18,16 @@ pkgbase="zfs-linux-lts-rc" pkgname=("zfs-linux-lts-rc" "zfs-linux-lts-rc-headers") _zfsver="0.8.0_rc3" -_kernelver="4.19.26-1" -_extramodules="4.19.26-1-lts" +_kernelver="4.19.27-1" +_extramodules="4.19.27-1-lts" pkgver="${_zfsver}_$(echo ${_kernelver} | sed s/-/./g)" pkgrel=1 makedepends=("linux-lts-headers=${_kernelver}" "python") arch=("x86_64") url="http://zfsonlinux.org/" -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=("5c344d6ff876d4c5286d83745700127054858cea379d31741fe96589ac40baff" - "6f27c3dae57c424e06aec31df6c1e1a821e547aa4e933f2f9b894b5e6762b52d") +source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${_zfsver/_/-}/zfs-${_zfsver/_/-}.tar.gz") +sha256sums=("5c344d6ff876d4c5286d83745700127054858cea379d31741fe96589ac40baff") 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 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; - |