[pve-devel] [PATCH kernel 4.15 4/5] update SPL/ZFS to 0.7.7

[Fabian Grünbichler]

and manually set the executable build on this new helper script

Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
 Makefile              | 2 ++
 submodules/zfsonlinux | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index aaf55f2..58c6094 100644
--- 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 871e750..42e934e 160000
--- a/submodules/zfsonlinux
+++ b/submodules/zfsonlinux
@@ -1 +1 @@
-Subproject commit 871e7503852e66921a44f51f2c8fa6256c6cfc40
+Subproject commit 42e934e27122194f6c78628c2bec24d99367ef3c
-- 
2.14.2