summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorArchzfs Buildbot2018-12-31 03:19:23 +0000
committerArchzfs Buildbot2018-12-31 03:19:23 +0000
commitb3c1828678713213f90b9e4a7cd61c700c72718b (patch)
tree3ca8b3446600d01963ede6bad4090cbdaf00a0d4
parentaa5b5ed3eeea38c9cbb31fd680b38aa862bbdc6e (diff)
downloadaur-b3c1828678713213f90b9e4a7cd61c700c72718b.tar.gz
Semi-automated update for kernel 4.20.0.arch1-1 + zfs 0.8.0-rc2
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD12
-rw-r--r--upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch19
3 files changed, 32 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bbb9d303749..07f527835a7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,17 @@
pkgbase = zfs-linux-rc
- pkgver = 0.8.0_rc2_4.19.12.arch1.1
- pkgrel = 2
+ pkgver = 0.8.0_rc2_4.20.arch1.1
+ pkgrel = 1
url = http://zfsonlinux.org/
arch = x86_64
license = CDDL
- makedepends = linux-headers=4.19.12.arch1-1
+ makedepends = linux-headers=4.20.arch1-1
depends = kmod
depends = zfs-utils-rc=0.8.0_rc2
- depends = linux=4.19.12.arch1-1
+ depends = linux=4.20.arch1-1
source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.0-rc2/zfs-0.8.0-rc2.tar.gz
+ source = upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch
sha256sums = 66fa2aa270586dc3c0f64d08b83f126f288163d6fb622e8d85e3e86a118a2082
+ sha256sums = 6f27c3dae57c424e06aec31df6c1e1a821e547aa4e933f2f9b894b5e6762b52d
pkgname = zfs-linux-rc
pkgdesc = Kernel modules for the Zettabyte File System.
diff --git a/PKGBUILD b/PKGBUILD
index 6955c6eea43..0e881177e26 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,16 +18,18 @@
pkgbase="zfs-linux-rc"
pkgname=("zfs-linux-rc" "zfs-linux-rc-headers")
_zfsver="0.8.0_rc2"
-_kernelver="4.19.12.arch1-1"
-_extramodules="${_kernelver/.arch/-arch}-ARCH"
+_kernelver="4.20.arch1-1"
+_extramodules="4.20.0-arch1-1-ARCH"
pkgver="${_zfsver}_$(echo ${_kernelver} | sed s/-/./g)"
-pkgrel=2
+pkgrel=1
makedepends=("linux-headers=${_kernelver}")
arch=("x86_64")
url="http://zfsonlinux.org/"
-source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${_zfsver/_/-}/zfs-${_zfsver/_/-}.tar.gz")
-sha256sums=("66fa2aa270586dc3c0f64d08b83f126f288163d6fb622e8d85e3e86a118a2082")
+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=("66fa2aa270586dc3c0f64d08b83f126f288163d6fb622e8d85e3e86a118a2082"
+ "6f27c3dae57c424e06aec31df6c1e1a821e547aa4e933f2f9b894b5e6762b52d")
license=("CDDL")
depends=("kmod" "zfs-utils-rc=${_zfsver}" "linux=${_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
new file mode 100644
index 00000000000..e3675229398
--- /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;
+