update SPL/ZFS to 0.7.7

and manually set the executable build on this new helper script

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/Makefile b/Makefile
index aaf55f2d15798bd9abbdda9cd1cd4c11302caa60..58c6094382a1271cd6aa38ad05138360f10208b7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -148,6 +148,8 @@ $(ZFSDIR).prepared: ${ZFSSRC}
        mkdir -p ${BUILD_DIR}/${MODULES}/${ZFSDIR}
        cp -a ${ZFSSRC}/* ${BUILD_DIR}/${MODULES}/${ZFSDIR}
        cd ${BUILD_DIR}/${MODULES}/${ZFSDIR}; for patch in ../../../${ZFSSRC}/../zfs-patches/*.patch; do patch -p1 < $${patch}; done
+       # temporarily since patch does not know about permissions, remove after 0.7.7 was merged properly
+       chmod +x ${BUILD_DIR}/${MODULES}/${ZFSDIR}/scripts/enum-extract.pl
        touch $@
 
 .PHONY: upload

diff --git a/submodules/zfsonlinux b/submodules/zfsonlinux
index 871e7503852e66921a44f51f2c8fa6256c6cfc40..42e934e27122194f6c78628c2bec24d99367ef3c 160000 (submodule)
--- a/submodules/zfsonlinux
+++ b/submodules/zfsonlinux
@@ -1 +1 @@
-Subproject commit 871e7503852e66921a44f51f2c8fa6256c6cfc40
+Subproject commit 42e934e27122194f6c78628c2bec24d99367ef3c