c/pve-kernel-lowlatency-qoup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ZFS/SPL: rework submodule and build

Browse Source 
to follow changes made to our zfsonlinux repository.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2019-02-27 15:06:54 +01:00 committed by Thomas Lamprecht
parent 9bd09ca97a
commit 62307a081a
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Makefile
View File

@ -49,9 +49,7 @@ IGBSRC=${IGBDIR}.tar.gz
ZFSONLINUX_SUBMODULE=submodules/zfsonlinux ZFSONLINUX_SUBMODULE=submodules/zfsonlinux
SPLDIR=pkg-spl SPLDIR=pkg-spl
SPLSRC=${ZFSONLINUX_SUBMODULE}/spl-debian
ZFSDIR=pkg-zfs ZFSDIR=pkg-zfs
ZFSSRC=${ZFSONLINUX_SUBMODULE}/zfs-debian
MODULES=modules MODULES=modules
MODULE_DIRS=${E1000EDIR} ${IGBDIR} ${SPLDIR} ${ZFSDIR} MODULE_DIRS=${E1000EDIR} ${IGBDIR} ${SPLDIR} ${ZFSDIR}
@ -131,19 +129,14 @@ ${IGBDIR}.prepared: ${IGBSRC}
cd ${BUILD_DIR}/${MODULES}/${IGBDIR}; patch -p1 < ../../../patches/intel/igb/igb_4.15_mtu.patch cd ${BUILD_DIR}/${MODULES}/${IGBDIR}; patch -p1 < ../../../patches/intel/igb/igb_4.15_mtu.patch
touch $@ touch $@
$(SPLDIR).prepared: ${SPLSRC} ${SPLDIR}.prepared: ${ZFSDIR}.prepared
rm -rf ${BUILD_DIR}/${MODULES}/${SPLDIR} $@ ${ZFSDIR}.prepared: ${ZFSONLINUX_SUBMODULE}
mkdir -p ${BUILD_DIR}/${MODULES}/${SPLDIR} rm -rf ${BUILD_DIR}/${MODULES}/${SPLDIR} ${BUILD_DIR}/${MODULES}/${ZFSDIR} ${BUILD_DIR}/${MODULES}/tmp $@
cp -a ${SPLSRC}/* ${BUILD_DIR}/${MODULES}/${SPLDIR} mkdir -p ${BUILD_DIR}/${MODULES}/tmp
cd ${BUILD_DIR}/${MODULES}/${SPLDIR}; for patch in ../../../${SPLSRC}/../spl-patches/*.patch; do patch -p1 < $${patch}; done cp -a ${ZFSONLINUX_SUBMODULE}/* ${BUILD_DIR}/${MODULES}/tmp
touch $@ cd ${BUILD_DIR}/${MODULES}/tmp; make kernel
rm -rf ${BUILD_DIR}/${MODULES}/tmp
$(ZFSDIR).prepared: ${ZFSSRC} touch ${ZFSDIR}.prepared ${SPLDIR}.prepared
rm -rf ${BUILD_DIR}/${MODULES}/${ZFSDIR} $@
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
touch $@
.PHONY: upload .PHONY: upload
upload: ${DEBS} upload: ${DEBS}
@ -157,15 +150,14 @@ distclean: clean
.PHONY: update_modules .PHONY: update_modules
update_modules: submodule update_modules: submodule
git submodule foreach 'git pull --ff-only origin master' git submodule foreach 'git pull --ff-only origin master'
cd ${ZFSSRC}; git pull --ff-only origin master cd ${ZFSONLINUX_SUBMODULE}; git pull --ff-only origin master
cd ${SPLSRC}; git pull --ff-only origin master
# make sure submodules were initialized # make sure submodules were initialized
.PHONY: submodule .PHONY: submodule
submodule: submodule:
test -f "${KERNEL_SRC_SUBMODULE}/README" || git submodule update --init ${KERNEL_SRC_SUBMODULE} test -f "${KERNEL_SRC_SUBMODULE}/README" || git submodule update --init ${KERNEL_SRC_SUBMODULE}
test -f "${ZFSONLINUX_SUBMODULE}/Makefile" || git submodule update --init ${ZFSONLINUX_SUBMODULE} test -f "${ZFSONLINUX_SUBMODULE}/Makefile" || git submodule update --init ${ZFSONLINUX_SUBMODULE}
(test -f "${ZFSSRC}/debian/changelog" && test -f "${SPLZRC}/debian/changelog") || (cd ${ZFSONLINUX_SUBMODULE}; git submodule update --init) (test -f "${ZFSONLINUX_SUBMODULE}/zfs/upstream/README.markdown" && test -f "${ZFSONLINUX_SUBMODULE}/spl/upstream/README.markdown") || (cd ${ZFSONLINUX_SUBMODULE}; git submodule update --init)
# call after ABI bump with header deb in working directory # call after ABI bump with header deb in working directory
.PHONY: abiupdate .PHONY: abiupdate

2
submodules/zfsonlinux

@ -1 +1 @@
Subproject commit 65a9766fa0cb96648f9abf044569b9ca6f36aac4 Subproject commit fa456d6c4bc8e46603aaa17e101756003304eeb7