forge/pve-kernel-thunderx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Fabian Grünbichler 2017-08-07 15:51:41 +02:00
parent 844d775e16
commit ca36280078
5 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.gitmodules vendored
View file

@ -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

12
Makefile
View file

@ -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

1
submodules/spl-module Submodule

@ -0,0 +1 @@
Subproject commit b6358351cca47024ffb421bf986f2a949608188e

1
submodules/zfs

@ -1 +0,0 @@
Subproject commit 1e88a708021d04beec91c3f2c6c8be9a12ca7677

1
submodules/zfs-module Submodule

@ -0,0 +1 @@
Subproject commit a540f8d7eff8fa1d79909c4f2e8a3a03535ede74