Semi-automated update for 4.7.2_1-6

3 files changed, 7 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1606303cb040..93c7fabc96ba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Aug 26 16:05:35 UTC 2016
+# Tue Sep 13 04:58:00 UTC 2016
 pkgbase = spl-linux-git
 	pkgdesc = Solaris Porting Layer kernel modules.
-	pkgver = 0.6.5_r69_gaeb9baa_4.7.2_1
-	pkgrel = 1
+	pkgver = 0.7.0_rc1_r0_g4fd75d3_4.7.2_1
+	pkgrel = 6
 	url = http://zfsonlinux.org/
 	install = spl.install
 	arch = x86_64
@@ -15,6 +15,7 @@ pkgbase = spl-linux-git
 	depends = kmod
 	depends = linux=4.7.2
 	provides = spl
+	replaces = spl-git
 	source = git+https://github.com/zfsonlinux/spl.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 66f354b7087b..91c6c830a032 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,8 +15,8 @@
 # archzfs github page.
 #
 pkgname="spl-linux-git"
-pkgver=0.6.5_r69_gaeb9baa_4.7.2_1
-pkgrel=1
+pkgver=0.7.0_rc1_r0_g4fd75d3_4.7.2_1
+pkgrel=6
 pkgdesc="Solaris Porting Layer kernel modules."
 depends=("spl-utils-linux-git" "kmod" "linux=4.7.2")
 makedepends=("linux-headers=4.7.2" "git")
@@ -28,6 +28,7 @@ groups=("archzfs-linux-git")
 license=("GPL")
 install=spl.install
 provides=("spl")
+replaces=("spl-git")
 
 build() {
     cd "${srcdir}/spl"
diff --git a/spl.install b/spl.install
index 637be0a0beb6..6b6c5cf74c56 100644
--- a/spl.install
+++ b/spl.install
@@ -1,5 +1,4 @@
 post_install() {
-    check_hostid
     run_depmod
 }
 
@@ -8,23 +7,9 @@ post_remove() {
 }
 
 post_upgrade() {
-    check_hostid
     run_depmod
 }
 
-check_hostid() {
-    # Check /etc/hostid to see if it set to the sentinel value, see
-    # https://wiki.archlinux.org/index.php/ZFS for more information.
-    HOSTID=$(hostid)
-    if [ "0x${HOSTID}" == "0xffffffff" ]; then
-        # Generate a new hostid
-        : >/etc/hostid
-        HOSTID=$(hostid)
-        # hostid is 4 byte little endian
-        printf $(echo -n $HOSTID | sed 's/\(..\)\(..\)\(..\)\(..\)/\x\4\x\3\x\2\x\1/') >/etc/hostid
-    fi
-}
-
 run_depmod() {
     echo ">>> Updating SPL module dependencies"
     depmod -a 4.7.2-1-ARCH