Semi-automated update for 4.14.25.1-1

3 files changed, 18 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2719bbab3c41..5005bfdd7bea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
 pkgbase = zfs-linux-lts-git
-	pkgver = 2018.03.06.r3353.639b18944.4.14.23.1
-	pkgrel = 2
+	pkgver = 2018.03.12.r3366.83362e8e6.4.14.25.1
+	pkgrel = 1
 	url = http://zfsonlinux.org/
 	arch = x86_64
 	license = CDDL
-	makedepends = linux-lts-headers=4.14.23-1
+	makedepends = linux-lts-headers=4.14.25-1
 	makedepends = libelf
 	makedepends = git
 	makedepends = spl-linux-lts-git-headers
 	depends = kmod
 	depends = spl-linux-lts-git
-	depends = zfs-utils-common-git=2018.03.06.r3353.639b18944
-	depends = linux-lts=4.14.23-1
-	source = git+https://github.com/zfsonlinux/zfs.git#commit=639b18944a6a3483c02039621c02dac08a954a90
+	depends = zfs-utils-common-git=2018.03.12.r3366.83362e8e6
+	depends = linux-lts=4.14.25-1
+	source = git+https://github.com/zfsonlinux/zfs.git#commit=83362e8e676a3ffae6b3b21f350f9b999a068605
 	sha256sums = SKIP
 
 pkgname = zfs-linux-lts-git
@@ -33,6 +33,8 @@ pkgname = zfs-linux-lts-git-headers
 	conflicts = zfs-linux-git-headers
 	conflicts = zfs-linux-threadripper-headers
 	conflicts = zfs-linux-threadripper-git-headers
+	conflicts = zfs-linux-threadripper-vfio-headers
+	conflicts = zfs-linux-threadripper-vfio-git-headers
 	conflicts = zfs-linux-vfio-headers
 	conflicts = zfs-linux-vfio-git-headers
 	conflicts = zfs-linux-zen-headers
diff --git a/PKGBUILD b/PKGBUILD
index f3f864990ea1..8725d326f838 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,15 +18,15 @@
 pkgbase="zfs-linux-lts-git"
 pkgname=("zfs-linux-lts-git" "zfs-linux-lts-git-headers")
 
-pkgver=2018.03.06.r3353.639b18944.4.14.23.1
-pkgrel=2
-makedepends=("linux-lts-headers=4.14.23-1" "libelf" "git" "spl-linux-lts-git-headers")
+pkgver=2018.03.12.r3366.83362e8e6.4.14.25.1
+pkgrel=1
+makedepends=("linux-lts-headers=4.14.25-1" "libelf" "git" "spl-linux-lts-git-headers")
 arch=("x86_64")
 url="http://zfsonlinux.org/"
-source=("git+https://github.com/zfsonlinux/zfs.git#commit=639b18944a6a3483c02039621c02dac08a954a90")
+source=("git+https://github.com/zfsonlinux/zfs.git#commit=83362e8e676a3ffae6b3b21f350f9b999a068605")
 sha256sums=("SKIP")
 license=("CDDL")
-depends=("kmod" "spl-linux-lts-git" "zfs-utils-common-git=2018.03.06.r3353.639b18944" "linux-lts=4.14.23-1")
+depends=("kmod" "spl-linux-lts-git" "zfs-utils-common-git=2018.03.12.r3366.83362e8e6" "linux-lts=4.14.25-1")
 
 build() {
     cd "${srcdir}/zfs"
@@ -34,8 +34,8 @@ build() {
     ./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.6 --with-config=kernel \
-                --with-linux=/usr/lib/modules/4.14.23-1-lts/build \
-                --with-linux-obj=/usr/lib/modules/4.14.23-1-lts/build
+                --with-linux=/usr/lib/modules/4.14.25-1-lts/build \
+                --with-linux-obj=/usr/lib/modules/4.14.25-1-lts/build
     make
 }
 
@@ -55,10 +55,10 @@ package_zfs-linux-lts-git() {
 
 package_zfs-linux-lts-git-headers() {
     pkgdesc="Kernel headers for the Zettabyte File System."
-    conflicts=('zfs-archiso-linux-headers' 'zfs-archiso-linux-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers' 'zfs-linux-lts-headers'  'zfs-linux-headers' 'zfs-linux-git-headers' 'zfs-linux-threadripper-headers' 'zfs-linux-threadripper-git-headers' 'zfs-linux-vfio-headers' 'zfs-linux-vfio-git-headers' 'zfs-linux-zen-headers' 'zfs-linux-zen-git-headers' )
+    conflicts=('zfs-archiso-linux-headers' 'zfs-archiso-linux-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers' 'zfs-linux-lts-headers'  'zfs-linux-headers' 'zfs-linux-git-headers' 'zfs-linux-threadripper-headers' 'zfs-linux-threadripper-git-headers' 'zfs-linux-threadripper-vfio-headers' 'zfs-linux-threadripper-vfio-git-headers' 'zfs-linux-vfio-headers' 'zfs-linux-vfio-git-headers' 'zfs-linux-zen-headers' 'zfs-linux-zen-git-headers' )
     cd "${srcdir}/zfs"
     make DESTDIR="${pkgdir}" install
     rm -r "${pkgdir}/lib"
     # Remove reference to ${srcdir}
-    sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.14.23-1-lts/Module.symvers
+    sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.14.25-1-lts/Module.symvers
 }
diff --git a/zfs.install b/zfs.install
index 110d172e76ce..d3cebb171718 100644
--- a/zfs.install
+++ b/zfs.install
@@ -12,7 +12,7 @@ post_upgrade() {
 
 check_initramfs() {
     echo ">>> Updating ZFS module dependencies"
-    depmod -a 4.14.23-1-lts
+    depmod -a 4.14.25-1-lts
     MK_CONF=$(grep -v '#' /etc/mkinitcpio.conf | grep zfs >/dev/null; echo $?);
     if [[ ${MK_CONF} == '0' && $1 == 'remove' ]]; then
         echo '>>> The ZFS packages have been removed, but "zfs" remains in the "hooks"'