Semi-automated update for 4.12.3_1-2

3 files changed, 16 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e5412eb70909..d667a6c40159 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Jul 28 18:51:24 UTC 2017
+# Sun Jul 30 23:19:48 UTC 2017
 pkgbase = zfs-linux-git
-	pkgver = 0.7.0_r1_g0f69f42b4_4.12.3_1
-	pkgrel = 1
+	pkgver = 0.7.0_r6_g1e0565d10_4.12.3_1
+	pkgrel = 2
 	url = http://zfsonlinux.org/
 	arch = x86_64
 	license = CDDL
@@ -11,7 +11,7 @@ pkgbase = zfs-linux-git
 	makedepends = spl-linux-git-headers
 	depends = kmod
 	depends = spl-linux-git
-	depends = zfs-utils-common-git
+	depends = zfs-utils-common-git>=0.7.0_r6_g1e0565d10
 	depends = linux=4.12.3-1
 	source = git+https://github.com/zfsonlinux/zfs.git
 	sha256sums = SKIP
@@ -26,9 +26,10 @@ pkgname = zfs-linux-git
 
 pkgname = zfs-linux-git-headers
 	pkgdesc = Kernel headers for the Zettabyte File System.
-	conflicts = zfs-linux-headers
-	conflicts = zfs-linux-lts-headers
-	conflicts = zfs-linux-lts-git-headers
+	conflicts = zfs-archiso-linux-headers
 	conflicts = zfs-linux-hardened-headers
 	conflicts = zfs-linux-hardened-git-headers
+	conflicts = zfs-linux-lts-headers
+	conflicts = zfs-linux-lts-git-headers
+	conflicts = zfs-linux-headers
 
diff --git a/PKGBUILD b/PKGBUILD
index 1460c160a38e..951b97df51ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,15 +16,15 @@
 #
 pkgbase="zfs-linux-git"
 pkgname=("zfs-linux-git" "zfs-linux-git-headers")
-pkgver=0.7.0_r1_g0f69f42b4_4.12.3_1
-pkgrel=1
+pkgver=0.7.0_r6_g1e0565d10_4.12.3_1
+pkgrel=2
 makedepends=("linux-headers=4.12.3-1" "git" "spl-linux-git-headers")
 arch=("x86_64")
 url="http://zfsonlinux.org/"
 source=("git+https://github.com/zfsonlinux/zfs.git")
 sha256sums=("SKIP")
 license=("CDDL")
-depends=("kmod" "spl-linux-git" "zfs-utils-common-git" "linux=4.12.3-1")
+depends=("kmod" "spl-linux-git" "zfs-utils-common-git>=0.7.0_r6_g1e0565d10" "linux=4.12.3-1")
 
 build() {
     cd "${srcdir}/zfs"
@@ -54,7 +54,7 @@ package_zfs-linux-git() {
 
 package_zfs-linux-git-headers() {
     pkgdesc="Kernel headers for the Zettabyte File System."
-    conflicts=('zfs-linux-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers')
+    conflicts=('zfs-archiso-linux-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-headers'  )
     cd "${srcdir}/zfs"
     make DESTDIR="${pkgdir}" install
     rm -r "${pkgdir}/lib"
diff --git a/zfs.install b/zfs.install
index b4112dcdc665..7e1ba1655196 100644
--- a/zfs.install
+++ b/zfs.install
@@ -14,14 +14,9 @@ check_initramfs() {
     echo ">>> Updating ZFS module dependencies"
     depmod -a 4.12.3-1-ARCH
     MK_CONF=$(grep -v '#' /etc/mkinitcpio.conf | grep zfs >/dev/null; echo $?);
-    if [[ ${MK_CONF} == '0' ]]; then
-        if [[ $1 == 'remove' ]]; then
-            echo '>>> The ZFS packages have been removed, but "zfs" remains in the "hooks"'
-            echo '>>> list in mkinitcpio.conf! You will need to remove "zfs" from the '
-            echo '>>> "hooks" list and then regenerate the initial ramdisk.'
-        else
-            echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
-            mkinitcpio -p linux
-        fi
+    if [[ ${MK_CONF} == '0' && $1 == 'remove' ]]; then
+        echo '>>> The ZFS packages have been removed, but "zfs" remains in the "hooks"'
+        echo '>>> list in mkinitcpio.conf! You will need to remove "zfs" from the '
+        echo '>>> "hooks" list and then regenerate the initial ramdisk.'
     fi
 }