瀏覽代碼

update SPL/ZFS to 0.7.7

and manually set the executable build on this new helper script

Signed-off-by: Fabian Grünbichler <[email protected]>
Fabian Grünbichler 7 年之前
父節點
當前提交
aac513414d
共有 2 個文件被更改,包括 3 次插入1 次删除
  1. 2 0
      Makefile
  2. 1 1
      submodules/zfsonlinux

+ 2 - 0
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

+ 1 - 1
submodules/zfsonlinux

@@ -1 +1 @@
-Subproject commit 871e7503852e66921a44f51f2c8fa6256c6cfc40
+Subproject commit 42e934e27122194f6c78628c2bec24d99367ef3c