summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorArchzfs Buildbot2019-04-18 18:23:23 +0000
committerArchzfs Buildbot2019-04-18 18:23:23 +0000
commit15151c711944f627fcf4c6ac43194197d278a7aa (patch)
tree621a7bb72651319c2e4ada70f6097fa4ab5551b4
parent3e4f20a47d8d7878884739a2dfc3ac905337b747 (diff)
downloadaur-15151c711944f627fcf4c6ac43194197d278a7aa.tar.gz
Semi-automated update for kernel 5.0.7.arch1-1 + zfs 0.8.0-rc4
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD12
-rw-r--r--upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch19
3 files changed, 11 insertions, 34 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 93bcb122656..d97ab6bccdf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,16 @@
pkgbase = zfs-linux-rc
- pkgver = 0.8.0_rc3_4.20.13.arch1.1
+ pkgver = 0.8.0_rc4_5.0.7.arch1.1
pkgrel = 1
url = http://zfsonlinux.org/
arch = x86_64
license = CDDL
- makedepends = linux-headers=4.20.13.arch1-1
+ makedepends = linux-headers=5.0.7.arch1-1
makedepends = python
depends = kmod
- depends = zfs-utils-rc=0.8.0_rc3
- depends = linux=4.20.13.arch1-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
+ depends = zfs-utils-rc=0.8.0_rc4
+ depends = linux=5.0.7.arch1-1
+ source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.0-rc4/zfs-0.8.0-rc4.tar.gz
+ sha256sums = 2a006686c0cf4360fbc1352cbf82ecd69a5029555bb038d23fbf5ad5d49359ba
pkgname = zfs-linux-rc
pkgdesc = Kernel modules for the Zettabyte File System.
diff --git a/PKGBUILD b/PKGBUILD
index 1d90e9ba4be..060f3eca5a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,19 +17,17 @@
#
pkgbase="zfs-linux-rc"
pkgname=("zfs-linux-rc" "zfs-linux-rc-headers")
-_zfsver="0.8.0_rc3"
-_kernelver="4.20.13.arch1-1"
-_extramodules="4.20.13-arch1-1-ARCH"
+_zfsver="0.8.0_rc4"
+_kernelver="5.0.7.arch1-1"
+_extramodules="5.0.7-arch1-1-ARCH"
pkgver="${_zfsver}_$(echo ${_kernelver} | sed s/-/./g)"
pkgrel=1
makedepends=("linux-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=("2a006686c0cf4360fbc1352cbf82ecd69a5029555bb038d23fbf5ad5d49359ba")
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
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;
-