Semi-automated update for kernel 4.18.6.a-1 + zfs 0.7.10

1 files changed, 15 insertions, 19 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 9b58accf216c..7a2843647bfc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,40 +17,36 @@
 #
 pkgbase="spl-linux-hardened"
 pkgname=("spl-linux-hardened" "spl-linux-hardened-headers")
+_splver="0.7.10"
+_kernelver="4.18.6.a-1"
+_extramodules="4.18.6.a-1-hardened"
 
-pkgver=0.7.9_4.18.5.a.1
-pkgrel=2
-makedepends=("linux-hardened-headers=4.18.5.a-1")
+pkgver="${_splver}_$(echo ${_kernelver} | sed s/-/./g)"
+pkgrel=1
+makedepends=("linux-hardened-headers=${_kernelver}")
 arch=("x86_64")
 url="http://zfsonlinux.org/"
-source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.9/spl-0.7.9.tar.gz"
-        "upstream-eb1f893-Linux-4.18-compat-inode-timespec_timespec64.patch")
-sha256sums=("49832e446a5abce0b55ba245c9b5f94959604d44378320fdffae0233bf1e8c00"
-            "72d1b4103c0b52e0fc2b7135485e346c898289ab42f7bc1ae2748d072a360f66")
+source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${_splver}/spl-${_splver}.tar.gz")
+sha256sums=("9647e0fe9f19cd99746da3cc48b8de8903a66dacdccc82b45dbbb516606f4ff8")
 license=("GPL")
-depends=("spl-utils-common=0.7.9" "kmod" "linux-hardened=4.18.5.a-1")
-prepare() {
-    cd "${srcdir}/spl-0.7.9"
-    patch -Np1 -i ${srcdir}/upstream-eb1f893-Linux-4.18-compat-inode-timespec_timespec64.patch
-}
+depends=("spl-utils-common=${_splver}" "kmod" "linux-hardened=${_kernelver}")
 
 build() {
-    cd "${srcdir}/spl-0.7.9"
+    cd "${srcdir}/spl-${_splver}"
     ./autogen.sh
     ./configure --prefix=/usr --libdir=/usr/lib --sbindir=/usr/bin \
-                --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 \
+                --with-linux=/usr/lib/modules/${_extramodules}/build \
+                --with-linux-obj=/usr/lib/modules/${_extramodules}/build \
                 --with-config=kernel
     make
 }
 
 package_spl-linux-hardened() {
     pkgdesc="Solaris Porting Layer kernel modules."
-    install=spl.install
     provides=("spl")
     groups=("archzfs-linux-hardened")
     conflicts=('spl-linux-hardened-git')
-    cd "${srcdir}/spl-0.7.9"
+    cd "${srcdir}/spl-${_splver}"
     make DESTDIR="${pkgdir}" install
     mv "${pkgdir}/lib" "${pkgdir}/usr/"
     # Remove src dir
@@ -60,9 +56,9 @@ package_spl-linux-hardened() {
 package_spl-linux-hardened-headers() {
     pkgdesc="Solaris Porting Layer kernel headers."
     conflicts=('spl-archiso-linux-headers' 'spl-archiso-linux-git-headers'  'spl-linux-hardened-git-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-headers' 'spl-linux-git-headers' 'spl-linux-vfio-headers' 'spl-linux-vfio-git-headers' 'spl-linux-zen-headers' 'spl-linux-zen-git-headers' )
-    cd "${srcdir}/spl-0.7.9"
+    cd "${srcdir}/spl-${_splver}"
     make DESTDIR="${pkgdir}" install
     rm -r "${pkgdir}/lib"
     # Remove reference to ${srcdir}
-    sed -i "s+${srcdir}++" ${pkgdir}/usr/src/spl-*/4.18.5.a-1-hardened/Module.symvers
+    sed -i "s+${srcdir}++" ${pkgdir}/usr/src/spl-*/${_extramodules}/Module.symvers
 }