Merge remote-tracking branch 'origin-zfs-stable' into zfs_git_wip

4 files changed, 6 insertions, 92 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0876bac4a9c8..bfd9d83d6dd3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Fri Jan 15 09:06:00 UTC 2016
+# Sat Mar 12 23:34:50 UTC 2016
 pkgbase = zfs-dkms-git
-	pkgver = 0.6.5_r118_gd21f279
+	pkgver = 0.6.5_r180_gc352ec2
 	pkgrel = 1
 	url = http://zfsonlinux.org/
 	arch = i686
@@ -15,14 +15,13 @@ pkgbase = zfs-dkms-git
 	source = zfs.initcpio.hook
 	sha256sums = SKIP
 	sha256sums = b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540
-	sha256sums = 70930eee5b0f55ba587220b9530170d91ef1eea98a37de9ae38f963dee410b3a
+	sha256sums = 1e20071fa61a33874505dae0f2d71bb560f43e7faaea735cbde770ea10c133df
 	sha256sums = 250f1232c464a81cc9c8b8ee05f21d752ebeebbc8614fae1c6d0bc600e816ac1
 
 pkgname = zfs-dkms-git
 	pkgdesc = Kernel modules for the Zettabyte File System. (Git version)
-	install = zfs.install
 	depends = spl-dkms-git
-	depends = zfs-utils-dkms-git=0.6.5_r118_gd21f279-1
+	depends = zfs-utils-dkms-git=0.6.5_r180_gc352ec2-1
 	depends = dkms
 	provides = zfs
 	conflicts = zfs-git
diff --git a/PKGBUILD b/PKGBUILD
index c132b868c153..aab373308cae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgbase="zfs-dkms-git"
 pkgname=("zfs-dkms-git" "zfs-utils-dkms-git")
-pkgver=0.6.5_r118_gd21f279
+pkgver=0.6.5_r180_gc352ec2
 pkgrel=1
 license=('CDDL')
 makedepends=("git" "spl-dkms-git")
@@ -16,7 +16,7 @@ source=("git+https://github.com/zfsonlinux/zfs.git"
         "zfs.initcpio.hook")
 sha256sums=('SKIP'
             'b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540'
-            '70930eee5b0f55ba587220b9530170d91ef1eea98a37de9ae38f963dee410b3a'
+            '1e20071fa61a33874505dae0f2d71bb560f43e7faaea735cbde770ea10c133df'
             '250f1232c464a81cc9c8b8ee05f21d752ebeebbc8614fae1c6d0bc600e816ac1')
 
 pkgver() {
@@ -46,7 +46,6 @@ package_zfs-dkms-git() {
     depends=("spl-dkms-git" "zfs-utils-dkms-git=${pkgver}-${pkgrel}" "dkms")
     provides=("zfs")
     conflicts=("zfs-git" "zfs-lts" "zfs-dkms")
-    install=zfs.install
 
     dkmsdir="${pkgdir}/usr/src/zfs-${pkgver%%_*}"
     install -d "${dkmsdir}"
diff --git a/zfs.initcpio.install b/zfs.initcpio.install
index e192c3bcbdd7..c128d1006371 100644
--- a/zfs.initcpio.install
+++ b/zfs.initcpio.install
@@ -1,12 +1,6 @@
 #!/bin/bash
 
 build() {
-    echo -en "Build spl module for ${KERNELVERSION} kernel... "
-    $(which dkms) install -m spl -v ##VERMARKER## -k ${KERNELVERSION} -q
-    echo -en "Done.\nBuild zfs module for ${KERNELVERSION} kernel... "
-    $(which dkms) install -m zfs -v ##VERMARKER## -k ${KERNELVERSION} -q
-    echo "Done."
-
     map add_module \
         zavl \
         znvpair \
diff --git a/zfs.install b/zfs.install
deleted file mode 100644
index 6cba9a637006..000000000000
--- a/zfs.install
+++ /dev/null
@@ -1,78 +0,0 @@
-post_install() {
-    dkms add zfs/${1%%[-_]*}
-    cat << EOF
-==> To build and install your modules run: dkms install zfs/${1%%[_-]*} -k [KERNEL]
-==> To do this automatically at startup run: systemctl enable dkms.service
-
-EOF
-    check_hook
-}
-
-pre_upgrade() {
-    if [ "${1%%[-_]*}" != "${2%%[-_]*}" ]; then
-        pre_remove "$2"
-    fi
-}
-
-post_upgrade() {
-    if [ "${1%%[-_]*}" != "${2%%[-_]*}" ]; then
-        post_install "$1"
-    fi
-}
-
-pre_remove() {
-    [ -n "${1%%[-_]*}" ] && dkms remove zfs/${1%%[-_]*} --all -q || true
-}
-
-post_remove() {
-    check_hook remove
-}
-
-check_hook() {
-    ZFSHOOKFILES=()
-
-    for preset in /etc/mkinitcpio.d/*.preset; do
-        source $preset
-        CONF_FILE=()
-
-        if [ -n "${ALL_config}" ]; then
-            CONF_FILE+=("${ALL_config}")
-            unset ALL_config
-        fi
-
-        for prefix in ${PRESETS[@]}; do
-            varname="${prefix}_config"
-            if [ -n "$(eval echo \$$varname)" ]; then
-                eval CONF_FILE+=("$(eval echo \$$varname)")
-                unset $varname
-            fi
-        done
-
-        i=0
-        unset ZFSHOOKPRESENCE
-        while [ $i -lt ${#CONF_FILE[@]} ]; do
-            if [ -e "${CONF_FILE[$i]}" ] && [ $(grep -q "zfs" ${CONF_FILE[$i]} && echo -n "1") ]; then
-                ZFSHOOKPRESENCE=1
-                if [ "$1" == "remove" ] && [ $(echo -n "${ZFSHOOKFILES[@]}" | grep -q "${CONF_FILE[$i]}" || echo -n "1") ]; then
-                    ZFSHOOKFILES+=("${CONF_FILE[$i]}")
-                fi
-            fi
-            i+=1
-        done
-
-        if [ ${ZFSHOOKPRESENCE} ]; then
-            if [ "$1" != "remove" ]; then
-                echo "==> Generating initial ramdisk for $(basename "$preset" .preset), using mkinitcpio. Please wait..."
-                mkinitcpio -p $(basename "$preset" .preset)
-            fi
-        fi
-    done
-
-    if [ "$1" == "remove" ] && [ ${#ZFSHOOKFILES[@]} -gt 0 ]; then
-        echo "==> zfs-dkms package has been removed but \"zfs\" is still in the hooks list of:"
-        for file in ${ZFSHOOKFILES[@]}; do
-            echo "  -> ${file}"
-        done
-        echo "==> Remove \"zfs\" and generate a new initrd."
-    fi
-}