Semi-automated update for 4.15.8.1-1

3 files changed, 16 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 010479b42982..031952fbdd91 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = spl-linux-git
-	pkgver = 2018.02.24.r1068.3673d03.4.15.7.1
+	pkgver = 2018.03.09.r1069.43983eb.4.15.8.1
 	pkgrel = 1
 	url = http://zfsonlinux.org/
 	arch = x86_64
 	license = GPL
-	makedepends = linux-headers=4.15.7-1
+	makedepends = linux-headers=4.15.8-1
 	makedepends = git
-	depends = spl-utils-common-git=2018.02.24.r1068.3673d03
+	depends = spl-utils-common-git=2018.03.09.r1069.43983eb
 	depends = kmod
-	depends = linux=4.15.7-1
-	source = git+https://github.com/zfsonlinux/spl.git#commit=3673d032850c3b54b8b2cc74cf1782a75cc9b2a9
+	depends = linux=4.15.8-1
+	source = git+https://github.com/zfsonlinux/spl.git#commit=43983eb2024ec6b3280e6e06a6fb621ee3bb2a41
 	sha256sums = SKIP
 
 pkgname = spl-linux-git
@@ -31,6 +31,8 @@ pkgname = spl-linux-git-headers
 	conflicts = spl-linux-headers
 	conflicts = spl-linux-threadripper-headers
 	conflicts = spl-linux-threadripper-git-headers
+	conflicts = spl-linux-threadripper-vfio-headers
+	conflicts = spl-linux-threadripper-vfio-git-headers
 	conflicts = spl-linux-vfio-headers
 	conflicts = spl-linux-vfio-git-headers
 	conflicts = spl-linux-zen-headers
diff --git a/PKGBUILD b/PKGBUILD
index c905d19b9f51..f54a0db2ed63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,22 +17,22 @@
 pkgbase="spl-linux-git"
 pkgname=("spl-linux-git" "spl-linux-git-headers")
 
-pkgver=2018.02.24.r1068.3673d03.4.15.7.1
+pkgver=2018.03.09.r1069.43983eb.4.15.8.1
 pkgrel=1
-makedepends=("linux-headers=4.15.7-1" "git")
+makedepends=("linux-headers=4.15.8-1" "git")
 arch=("x86_64")
 url="http://zfsonlinux.org/"
-source=("git+https://github.com/zfsonlinux/spl.git#commit=3673d032850c3b54b8b2cc74cf1782a75cc9b2a9")
+source=("git+https://github.com/zfsonlinux/spl.git#commit=43983eb2024ec6b3280e6e06a6fb621ee3bb2a41")
 sha256sums=("SKIP")
 license=("GPL")
-depends=("spl-utils-common-git=2018.02.24.r1068.3673d03" "kmod" "linux=4.15.7-1")
+depends=("spl-utils-common-git=2018.03.09.r1069.43983eb" "kmod" "linux=4.15.8-1")
 
 build() {
     cd "${srcdir}/spl"
     ./autogen.sh
     ./configure --prefix=/usr --libdir=/usr/lib --sbindir=/usr/bin \
-                --with-linux=/usr/lib/modules/4.15.7-1-ARCH/build \
-                --with-linux-obj=/usr/lib/modules/4.15.7-1-ARCH/build \
+                --with-linux=/usr/lib/modules/4.15.8-1-ARCH/build \
+                --with-linux-obj=/usr/lib/modules/4.15.8-1-ARCH/build \
                 --with-config=kernel
     make
 }
@@ -53,10 +53,10 @@ package_spl-linux-git() {
 
 package_spl-linux-git-headers() {
     pkgdesc="Solaris Porting Layer kernel headers."
-    conflicts=('spl-archiso-linux-headers' 'spl-archiso-linux-git-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-headers'  'spl-linux-threadripper-headers' 'spl-linux-threadripper-git-headers' 'spl-linux-vfio-headers' 'spl-linux-vfio-git-headers' 'spl-linux-zen-headers' 'spl-linux-zen-git-headers' )
+    conflicts=('spl-archiso-linux-headers' 'spl-archiso-linux-git-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-headers'  'spl-linux-threadripper-headers' 'spl-linux-threadripper-git-headers' 'spl-linux-threadripper-vfio-headers' 'spl-linux-threadripper-vfio-git-headers' 'spl-linux-vfio-headers' 'spl-linux-vfio-git-headers' 'spl-linux-zen-headers' 'spl-linux-zen-git-headers' )
     cd "${srcdir}/spl"
     make DESTDIR="${pkgdir}" install
     rm -r "${pkgdir}/lib"
     # Remove reference to ${srcdir}
-    sed -i "s+${srcdir}++" ${pkgdir}/usr/src/spl-*/4.15.7-1-ARCH/Module.symvers
+    sed -i "s+${srcdir}++" ${pkgdir}/usr/src/spl-*/4.15.8-1-ARCH/Module.symvers
 }
diff --git a/spl.install b/spl.install
index b145a291a56d..4bebdd862ae5 100644
--- a/spl.install
+++ b/spl.install
@@ -12,5 +12,5 @@ post_upgrade() {
 
 run_depmod() {
     echo ">>> Updating SPL module dependencies"
-    depmod -a 4.15.7-1-ARCH
+    depmod -a 4.15.8-1-ARCH
 }