Semi-automated update for kernel 5.0.0.arch1-1 + latest git commit

3 files changed, 11 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c64712080774..2902a6109e9d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,17 @@
 pkgbase = zfs-linux-git
-	pkgver = 2019.02.28.r4983.g0409679d8_4.20.13.arch1.1
+	pkgver = 2019.03.06.r4987.gbecdcec7b_5.0.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.arch1-1
 	makedepends = git
 	makedepends = python
 	depends = kmod
-	depends = zfs-utils-git=2019.02.28.r4983.g0409679d8
-	depends = linux=4.20.13.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
+	depends = zfs-utils-git=2019.03.06.r4987.gbecdcec7b
+	depends = linux=5.0.arch1-1
+	source = git+https://github.com/zfsonlinux/zfs.git#commit=becdcec7b9cd6b8beaa2273495b97c06de24e9e5
 	sha256sums = SKIP
-	sha256sums = 6f27c3dae57c424e06aec31df6c1e1a821e547aa4e933f2f9b894b5e6762b52d
 
 pkgname = zfs-linux-git
 	pkgdesc = Kernel modules for the Zettabyte File System.
diff --git a/PKGBUILD b/PKGBUILD
index 667ef40e58c1..335d4ddabdbd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,20 +17,18 @@
 #
 pkgbase="zfs-linux-git"
 pkgname=("zfs-linux-git" "zfs-linux-git-headers")
-_commit='0409679d88a8ccd06397ceae1b6d08935198c756'
-_zfsver="2019.02.28.r4983.g0409679d8"
-_kernelver="4.20.13.arch1-1"
-_extramodules="4.20.13-arch1-1-ARCH"
+_commit='becdcec7b9cd6b8beaa2273495b97c06de24e9e5'
+_zfsver="2019.03.06.r4987.gbecdcec7b"
+_kernelver="5.0.arch1-1"
+_extramodules="5.0.0-arch1-1-ARCH"
 
 pkgver="${_zfsver}_$(echo ${_kernelver} | sed s/-/./g)"
 pkgrel=1
 makedepends=("linux-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=${_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;
-