Semi-automated update for kernel 4.18.6.a-1 + latest git commit

1 files changed, 14 insertions, 16 deletions

diff --git a/PKGBUILD b/PKGBUILD
index ee018b3e4c16..9c38de46eb45 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,31 +17,29 @@
 #
 pkgbase="zfs-linux-hardened-git"
 pkgname=("zfs-linux-hardened-git" "zfs-linux-hardened-git-headers")
+_commit='b8a90418f3a9c23b89c5d2c729a4dd0fea644508'
+_zfsver="2018.09.07.r4720.gb8a90418f"
+_kernelver="4.18.6.a-1"
+_extramodules="4.18.6.a-1-hardened"
 
-pkgver=2018.08.23.r4692.g55972a672.4.18.5.a.1
+pkgver="${_zfsver}_$(echo ${_kernelver} | sed s/-/./g)"
 pkgrel=1
-makedepends=("linux-hardened-headers=4.18.5.a-1" "git")
+makedepends=("linux-hardened-headers=${_kernelver}" "git")
 arch=("x86_64")
 url="http://zfsonlinux.org/"
-source=("git+https://github.com/zfsonlinux/zfs.git#commit=55972a6724ca49d98d67a47fe0f0b28ad21260d5"
-        "upstream-ac09630-Fix-zpl_mount-deadlock.patch"
-        "upstream-9f64c1e-Linux-4.18-compat-inode-timespec_timespec64.patch"
-        "upstream-9161ace-Linux-compat-4.18-check_disk_size_change.patch")
-sha256sums=("SKIP" 
-            "1799f6f7b2a60a23b66106c9470414628398f6bfc10da3d0f41c548bba6130e8"
-            "03ed45af40850c3a51a6fd14f36c1adc06501c688a67afb13db4fded6ec9db1d"
-            "afbde4a2507dff989404665dbbdfe18eecf5aba716a6513902affa0e4cb033fe")
+source=("git+https://github.com/zfsonlinux/zfs.git#commit=${_commit}")
+sha256sums=("SKIP")
 license=("CDDL")
-depends=("kmod" "zfs-utils-common-git=2018.08.23.r4692.g55972a672" "linux-hardened=4.18.5.a-1")
+depends=("kmod" "zfs-utils-common-git=${_zfsver}" "linux-hardened=${_kernelver}")
 
 build() {
     cd "${srcdir}/zfs"
     ./autogen.sh
     ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --libdir=/usr/lib \
                 --datadir=/usr/share --includedir=/usr/include --with-udevdir=/lib/udev \
-                --libexecdir=/usr/lib/zfs-0.7.9 --with-config=kernel \
-                --with-linux=/usr/lib/modules/4.18.5.a-1-hardened/build \
-                --with-linux-obj=/usr/lib/modules/4.18.5.a-1-hardened/build
+                --libexecdir=/usr/lib/zfs-${zfsver} --with-config=kernel \
+                --with-linux=/usr/lib/modules/${_extramodules}/build \
+                --with-linux-obj=/usr/lib/modules/${_extramodules}/build
     make
 }
 
@@ -50,7 +48,7 @@ package_zfs-linux-hardened-git() {
     install=zfs.install
     provides=("zfs")
     groups=("archzfs-linux-hardened-git")
-    conflicts=('zfs-linux-hardened' 'spl-linux-hardened-git')
+    conflicts=('zfs-linux-hardened' 'spl-linux-hardened-git' 'spl-linux-hardened')
     replaces=("spl-linux-hardened-git")
     cd "${srcdir}/zfs"
     make DESTDIR="${pkgdir}" install
@@ -67,5 +65,5 @@ package_zfs-linux-hardened-git-headers() {
     make DESTDIR="${pkgdir}" install
     rm -r "${pkgdir}/lib"
     # Remove reference to ${srcdir}
-    sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.18.5.a-1-hardened/Module.symvers
+    sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/${_extramodules}/Module.symvers
 }