diff options
author | Archzfs Buildbot | 2019-03-08 01:05:00 +0000 |
---|---|---|
committer | Archzfs Buildbot | 2019-03-08 01:05:00 +0000 |
commit | d9d35c9573a8498b25caf400bfba7670bfdbccb1 (patch) | |
tree | 3811a1580b56c44002694ca6987fed9a8bebd786 | |
parent | 192632d58230d982fbf851f6e9551f065a31c41d (diff) | |
download | aur-d9d35c9573a8498b25caf400bfba7670bfdbccb1.tar.gz |
Semi-automated update for kernel 4.19.27-1 + latest git commit
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 14 | ||||
-rw-r--r-- | upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch | 19 |
3 files changed, 11 insertions, 34 deletions
@@ -1,19 +1,17 @@ pkgbase = zfs-linux-lts-git - pkgver = 2019.02.28.r4983.g0409679d8_4.19.26.1 + pkgver = 2019.03.06.r4987.gbecdcec7b_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 = git makedepends = python depends = kmod - depends = zfs-utils-git=2019.02.28.r4983.g0409679d8 - depends = linux-lts=4.19.26-1 - source = git+https://github.com/zfsonlinux/zfs.git#commit=0409679d88a8ccd06397ceae1b6d08935198c756 - source = upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch + depends = zfs-utils-git=2019.03.06.r4987.gbecdcec7b + depends = linux-lts=4.19.27-1 + source = git+https://github.com/zfsonlinux/zfs.git#commit=becdcec7b9cd6b8beaa2273495b97c06de24e9e5 sha256sums = SKIP - sha256sums = 6f27c3dae57c424e06aec31df6c1e1a821e547aa4e933f2f9b894b5e6762b52d pkgname = zfs-linux-lts-git pkgdesc = Kernel modules for the Zettabyte File System. @@ -17,20 +17,18 @@ # pkgbase="zfs-linux-lts-git" pkgname=("zfs-linux-lts-git" "zfs-linux-lts-git-headers") -_commit='0409679d88a8ccd06397ceae1b6d08935198c756' -_zfsver="2019.02.28.r4983.g0409679d8" -_kernelver="4.19.26-1" -_extramodules="4.19.26-1-lts" +_commit='becdcec7b9cd6b8beaa2273495b97c06de24e9e5' +_zfsver="2019.03.06.r4987.gbecdcec7b" +_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}" "git" "python") 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=("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 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; - |