From 4abb1088a311eeaf67250574f99d74ce78d996d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Wed, 4 Apr 2018 14:20:59 +0200
Subject: [PATCH] update SPL/ZFS to 0.7.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
and manually set the executable build on this new helper script
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
Makefile | 2 ++
submodules/zfsonlinux | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 553a30f..02f07ba 100644
--- a/Makefile
+++ b/Makefile
@@ -146,6 +146,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