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

3 files changed, 15 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4d4e67ae81fb..09334dcc9278 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
 pkgbase = zfs-linux-hardened-git
-	pkgver = 2018.07.24.r4643.g473c976a0.4.17.9.a.1
+	pkgver = 2018.07.25.r4646.g3a549dc7a.4.17.10.a.1
 	pkgrel = 1
 	url = http://zfsonlinux.org/
 	arch = x86_64
 	license = CDDL
-	makedepends = linux-hardened-headers=4.17.9.a-1
+	makedepends = linux-hardened-headers=4.17.10.a-1
 	makedepends = git
 	depends = kmod
-	depends = zfs-utils-common-git=2018.07.24.r4643.g473c976a0
-	depends = linux-hardened=4.17.9.a-1
-	source = git+https://github.com/zfsonlinux/zfs.git#commit=473c976a0c4da84d8b49edaaf3d88a716d8dde2c
+	depends = zfs-utils-common-git=2018.07.25.r4646.g3a549dc7a
+	depends = linux-hardened=4.17.10.a-1
+	source = git+https://github.com/zfsonlinux/zfs.git#commit=3a549dc7a1f5e5511b4c8699081f704eeb4381b7
+	source = upstream-ac09630-Fix-zpl_mount-deadlock.patch
 	sha256sums = SKIP
+	sha256sums = 1799f6f7b2a60a23b66106c9470414628398f6bfc10da3d0f41c548bba6130e8
 
 pkgname = zfs-linux-hardened-git
 	pkgdesc = Kernel modules for the Zettabyte File System.
diff --git a/PKGBUILD b/PKGBUILD
index 1a7523f11ef4..8248badeca96 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,15 +18,15 @@
 pkgbase="zfs-linux-hardened-git"
 pkgname=("zfs-linux-hardened-git" "zfs-linux-hardened-git-headers")
 
-pkgver=2018.07.24.r4643.g473c976a0.4.17.9.a.1
+pkgver=2018.07.25.r4646.g3a549dc7a.4.17.10.a.1
 pkgrel=1
-makedepends=("linux-hardened-headers=4.17.9.a-1" "git")
+makedepends=("linux-hardened-headers=4.17.10.a-1" "git")
 arch=("x86_64")
 url="http://zfsonlinux.org/"
-source=("git+https://github.com/zfsonlinux/zfs.git#commit=473c976a0c4da84d8b49edaaf3d88a716d8dde2c" "upstream-ac09630-Fix-zpl_mount-deadlock.patch")
+source=("git+https://github.com/zfsonlinux/zfs.git#commit=3a549dc7a1f5e5511b4c8699081f704eeb4381b7" "upstream-ac09630-Fix-zpl_mount-deadlock.patch")
 sha256sums=("SKIP" "1799f6f7b2a60a23b66106c9470414628398f6bfc10da3d0f41c548bba6130e8")
 license=("CDDL")
-depends=("kmod" "zfs-utils-common-git=2018.07.24.r4643.g473c976a0" "linux-hardened=4.17.9.a-1")
+depends=("kmod" "zfs-utils-common-git=2018.07.25.r4646.g3a549dc7a" "linux-hardened=4.17.10.a-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.9 --with-config=kernel \
-                --with-linux=/usr/lib/modules/4.17.9-1-hardened/build \
-                --with-linux-obj=/usr/lib/modules/4.17.9-1-hardened/build
+                --with-linux=/usr/lib/modules/4.17.10-1-hardened/build \
+                --with-linux-obj=/usr/lib/modules/4.17.10-1-hardened/build
     make
 }
 
@@ -61,5 +61,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.17.9-1-hardened/Module.symvers
+    sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.17.10-1-hardened/Module.symvers
 }
diff --git a/zfs.install b/zfs.install
index 53bb9f1a1075..cdeae04fb5fc 100644
--- a/zfs.install
+++ b/zfs.install
@@ -12,7 +12,7 @@ post_upgrade() {
 
 check_initramfs() {
     echo ">>> Updating ZFS module dependencies"
-    depmod -a 4.17.9-1-hardened
+    depmod -a 4.17.10-1-hardened
     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"'