summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorArchzfs Buildbot2019-03-08 01:05:19 +0000
committerArchzfs Buildbot2019-03-08 01:05:19 +0000
commitb2123bbe47dc6faf72970afd253f881fdc3e62f2 (patch)
treeea3a491583b947b54b6bc98adfd2a69fe0b4e3f7
parent987585bde2a9f963acba7cb376b37132f59f1880 (diff)
downloadaur-b2123bbe47dc6faf72970afd253f881fdc3e62f2.tar.gz
Semi-automated update for kernel 4.20.12.arch1-1 + latest git commit
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD10
-rw-r--r--upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch19
3 files changed, 7 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b6af62b4832..18bbd541de5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = zfs-linux-vfio-git
- pkgver = 2019.02.28.r4983.g0409679d8_4.20.12.arch1.1
+ pkgver = 2019.03.06.r4987.gbecdcec7b_4.20.12.arch1.1
pkgrel = 1
url = http://zfsonlinux.org/
arch = x86_64
@@ -8,12 +8,10 @@ pkgbase = zfs-linux-vfio-git
makedepends = git
makedepends = python
depends = kmod
- depends = zfs-utils-git=2019.02.28.r4983.g0409679d8
+ depends = zfs-utils-git=2019.03.06.r4987.gbecdcec7b
depends = linux-vfio=4.20.12.arch1-1
- 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-linux-vfio-git
pkgdesc = Kernel modules for the Zettabyte File System.
diff --git a/PKGBUILD b/PKGBUILD
index f6f983c4944..f9005828dc1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,8 +17,8 @@
#
pkgbase="zfs-linux-vfio-git"
pkgname=("zfs-linux-vfio-git" "zfs-linux-vfio-git-headers")
-_commit='0409679d88a8ccd06397ceae1b6d08935198c756'
-_zfsver="2019.02.28.r4983.g0409679d8"
+_commit='becdcec7b9cd6b8beaa2273495b97c06de24e9e5'
+_zfsver="2019.03.06.r4987.gbecdcec7b"
_kernelver="4.20.12.arch1-1"
_extramodules="4.20.12-arch1-1-vfio"
@@ -27,10 +27,8 @@ pkgrel=1
makedepends=("linux-vfio-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-vfio=${_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 e3675229398..00000000000
--- 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;
-