From 8a19f2ad5d9644adff45d0d239c3ec7005c16139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Fri, 28 Jul 2017 10:51:33 +0200 Subject: [PATCH] buildsys: switch to submodules --- Makefile | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index d1efd8d..c8fb342 100644 --- a/Makefile +++ b/Makefile @@ -8,10 +8,10 @@ SPLPKGREL=pve9~bpo90 ZFSPKGVER=${ZFSVER}-${ZFSPKGREL} SPLPKGVER=${ZFSVER}-${SPLPKGREL} -SPLDIR=pkg-spl -SPLSRC=pkg-spl.tar.gz -ZFSDIR=pkg-zfs -ZFSSRC=pkg-zfs.tar.gz +SPLDIR=spl-build +SPLSRC=spl-debian +ZFSDIR=zfs-build +ZFSSRC=zfs-debian SPL_DEBS= \ spl_${SPLPKGVER}_amd64.deb @@ -36,10 +36,16 @@ deb: ${DEBS} dinstall: ${DEBS} dpkg -i ${DEBS} +.PHONY: submodule +submodule: + test -f "${ZFSSRC}/debian/changelog" || git submodule update --init + test -f "${SPLSRC}/debian/changelog" || git submodule update --init + .PHONY: spl spl ${SPL_DEBS}: ${SPLSRC} rm -rf ${SPLDIR} - tar xf ${SPLSRC} + mkdir ${SPLDIR} + cp -a ${SPLSRC}/* ${SPLDIR}/ mv ${SPLDIR}/debian/changelog ${SPLDIR}/debian/changelog.org cat spl-changelog.Debian ${SPLDIR}/debian/changelog.org > ${SPLDIR}/debian/changelog cd ${SPLDIR}; ln -s ../spl-patches patches @@ -50,7 +56,8 @@ spl ${SPL_DEBS}: ${SPLSRC} .PHONY: zfs zfs ${ZFS_DEBS} ${ZFS_TRANS_DEBS}: ${ZFSSRC} rm -rf ${ZFSDIR} - tar xf ${ZFSSRC} + mkdir ${ZFSDIR} + cp -a ${ZFSSRC}/* ${ZFSDIR}/ mv ${ZFSDIR}/debian/changelog ${ZFSDIR}/debian/changelog.org cat zfs-changelog.Debian ${ZFSDIR}/debian/changelog.org > ${ZFSDIR}/debian/changelog cd ${ZFSDIR}; ln -s ../zfs-patches patches