zfs/spl: update to 0.6.5.11-1, switch submodules

diff --git a/.gitmodules b/.gitmodules
index 618de8db9e5244cafa21d2743ce07926b45b3673..ce8601f0bed5ff80cb5c5beaebf1e110eb396cd0 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,9 @@
 [submodule "submodules/ubuntu-zesty"]
        path = submodules/ubuntu-zesty
        url = ../mirror_ubuntu-zesty-kernel
-[submodule "submodules/zfs"]
-       path = submodules/zfs
-       url = ../zfsonlinux
+[submodule "submodules/zfs-module"]
+       path = submodules/zfs-module
+       url = ../mirror_zfs-debian
+[submodule "submodules/spl-module"]
+       path = submodules/spl-module
+       url = ../mirror_spl-debian

diff --git a/Makefile b/Makefile
index abc4e79c0f5ba5e2cedeb41a943a6d73e31d9249..744aee32ac7eed1ac8c181d07e90d5c79f26488f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -45,9 +45,9 @@ IXGBEDIR=ixgbe-5.0.4
 IXGBESRC=${IXGBEDIR}.tar.gz
 
 SPLDIR=pkg-spl
-SPLSRC=submodules/zfs/pkg-spl.tar.gz
+SPLSRC=submodules/spl-module
 ZFSDIR=pkg-zfs
-ZFSSRC=submodules/zfs/pkg-zfs.tar.gz
+ZFSSRC=submodules/zfs-module
 ZFS_KO=zfs.ko
 ZFS_KO_REST=zavl.ko znvpair.ko zunicode.ko zcommon.ko zpios.ko
 ZFS_MODULES=$(ZFS_KO) $(ZFS_KO_REST)
@@ -282,7 +282,7 @@ ixgbe.ko ixgbe: .compile_mark ${IXGBESRC}
 $(SPL_KO_REST): $(SPL_KO)
 $(SPL_KO): .compile_mark ${SPLSRC}
        rm -rf ${SPLDIR}
-       tar xf ${SPLSRC}
+       rsync -ra ${SPLSRC}/ ${SPLDIR}
        [ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
        cd ${SPLDIR}; ./autogen.sh
        cd ${SPLDIR}; ./configure --with-config=kernel --with-linux=${TOP}/${KERNEL_SRC} --with-linux-obj=${TOP}/${KERNEL_SRC}
@@ -293,7 +293,7 @@ $(SPL_KO): .compile_mark ${SPLSRC}
 $(ZFS_KO_REST): $(ZFS_KO)
 $(ZFS_KO): .compile_mark ${ZFSSRC}
        rm -rf ${ZFSDIR}
-       tar xf ${ZFSSRC}
+       rsync -ra ${ZFSSRC}/ ${ZFSDIR}
        [ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
        cd ${ZFSDIR}; ./autogen.sh
        cd ${ZFSDIR}; ./configure --with-spl=${TOP}/${SPLDIR} --with-spl-obj=${TOP}/${SPLDIR} --with-config=kernel --with-linux=${TOP}/${KERNEL_SRC} --with-linux-obj=${TOP}/${KERNEL_SRC}
@@ -350,8 +350,10 @@ update_modules: submodules
 
 # make sure submodules were initialized
 .PHONY: submodules
-submodules ${SPLSRC} ${ZFSSRC}:
+submodules:
        test -f "${KERNEL_SRC_SUBMODULE}/README" || git submodule update --init
+       test -f "${ZFSSRC}/debian/changelog" || git submodule update --init
+       test -f "${SPLSRC}/debian/changelog" || git submodule update --init
 
 
 .PHONY: clean

diff --git a/submodules/spl-module b/submodules/spl-module
new file mode 160000 (submodule)
index 0000000..b635835
--- /dev/null
+++ b/submodules/spl-module
@@ -0,0 +1 @@
+Subproject commit b6358351cca47024ffb421bf986f2a949608188e

diff --git a/submodules/zfs b/submodules/zfs
deleted file mode 160000 (submodule)
index 1e88a70..0000000
--- a/submodules/zfs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1e88a708021d04beec91c3f2c6c8be9a12ca7677

diff --git a/submodules/zfs-module b/submodules/zfs-module
new file mode 160000 (submodule)
index 0000000..a540f8d
--- /dev/null
+++ b/submodules/zfs-module
@@ -0,0 +1 @@
+Subproject commit a540f8d7eff8fa1d79909c4f2e8a3a03535ede74