rebase patches on top of zfs-0.7.13

[zfsonlinux.git] / Makefile

diff --git a/Makefile b/Makefile
index d22d8a44918d1d90b3c3094ac6cee4cec8333f6c..2c0ab01fb50f83489dead306cf05d18e2d31e6cc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,25 @@
-RELEASE=5.0
+RELEASE=5.1
 
 # source form https://github.com/zfsonlinux/
 
-ZFSVER=0.6.5.9
-ZFSPKGREL=pve16~bpo90
-SPLPKGREL=pve9~bpo90
-ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
-SPLPKGVER=${ZFSVER}-${SPLPKGREL}
+SPLDIR=spl-linux_${ZFSVER}
+SPLSRC=spl/upstream
+SPLPKG=spl/debian
+ZFSDIR=zfs-linux_${ZFSVER}
+ZFSSRC=zfs/upstream
+ZFSPKG=zfs/debian
 
-SPLDIR=pkg-spl
-SPLSRC=pkg-spl.tar.gz
-ZFSDIR=pkg-zfs
-ZFSSRC=pkg-zfs.tar.gz
+ZFSVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion | cut -d- -f1
 
-SPL_DEBS=                                      \
+ZFSPKGVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion
+SPLPKGVER != dpkg-parsechangelog -l ${SPLPKG}/changelog -Sversion
+
+SPL_DEB =                                      \
 spl_${SPLPKGVER}_amd64.deb
+SPL_DSC = spl-linux_${SPLPKGVER}.dsc
 
-ZFS_DEBS=                                      \
-libnvpair1linux_${ZFSPKGVER}_amd64.deb         \
+ZFS_DEB1= libnvpair1linux_${ZFSPKGVER}_amd64.deb
+ZFS_DEB2=                                      \
 libuutil1linux_${ZFSPKGVER}_amd64.deb          \
 libzfs2linux_${ZFSPKGVER}_amd64.deb            \
 libzfslinux-dev_${ZFSPKGVER}_amd64.deb         \
@@ -25,56 +27,78 @@ libzpool2linux_${ZFSPKGVER}_amd64.deb               \
 zfs-dbg_${ZFSPKGVER}_amd64.deb                 \
 zfs-zed_${ZFSPKGVER}_amd64.deb                 \
 zfs-initramfs_${ZFSPKGVER}_all.deb             \
+zfs-test_${ZFSPKGVER}_amd64.deb                \
 zfsutils-linux_${ZFSPKGVER}_amd64.deb
+ZFS_DEBS= $(ZFS_DEB1) $(ZFS_DEB2)
+ZFS_DSC = zfs-linux_${ZFSPKGVER}.dsc
+
+DEBS=${SPL_DEB} ${ZFS_DEBS}
+DSCS=${SPL_DSC} ${ZFS_DSC}
 
-DEBS=${SPL_DEBS} ${ZFS_DEBS}
+all: deb
+.PHONY: deb
+deb: ${DEBS}
+.PHONY: dsc
+dsc: ${DSCS}
 
-all: ${DEBS}
+# called from pve-kernel's Makefile to get patched sources
+.PHONY: kernel
+kernel: dsc
+       dpkg-source -x ${SPL_DSC} ../pkg-spl
+       dpkg-source -x ${ZFS_DSC} ../pkg-zfs
 
 .PHONY: dinstall
 dinstall: ${DEBS}
        dpkg -i ${DEBS}
 
+.PHONY: submodule
+submodule:
+       test -f "${ZFSSRC}/README.markdown" || git submodule update --init
+       test -f "${SPLSRC}/README.markdown" || git submodule update --init
+
 .PHONY: spl
-spl ${SPL_DEBS}: ${SPLSRC}
+spl: ${SPL_DEB}
+${SPL_DEB}: ${SPLDIR}
+       cd ${SPLDIR}; dpkg-buildpackage -b -uc -us
+       lintian ${SPL_DEB}
+
+${SPL_DSC}: ${SPLDIR}
+       tar czf spl-linux_${ZFSVER}.orig.tar.gz ${SPLDIR}
+       cd ${SPLDIR}; dpkg-buildpackage -S -uc -us -d
+       lintian $@
+
+${SPLDIR}: ${SPLSRC} ${SPLPKG}
        rm -rf ${SPLDIR}
-       tar xf ${SPLSRC}
-       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
-       cd ${SPLDIR}; quilt push -a
-       cd ${SPLDIR}; rm -rf .pc ./patches
-       cd ${SPLDIR}; dpkg-buildpackage -b -uc -us 
+       mkdir ${SPLDIR}
+       cp -a ${SPLSRC}/* ${SPLDIR}/
+       cp -a ${SPLPKG} ${SPLDIR}/debian
 
 .PHONY: zfs
-zfs ${ZFS_DEBS} ${ZFS_TRANS_DEBS}: ${ZFSSRC}
+zfs: $(ZFS_DEBS)
+$(ZFS_DEB2): $(ZFS_DEB1)
+$(ZFS_DEB1): ${ZFSDIR}
+       cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
+       lintian ${ZFS_DEBS}
+
+${ZFS_DSC}: ${ZFSDIR}
+       tar czf zfs-linux_${ZFSVER}.orig.tar.gz ${ZFSDIR}
+       cd ${ZFSDIR}; dpkg-buildpackage -S -uc -us -d
+       lintian $@
+
+${ZFSDIR}: $(ZFSSRC) ${ZFSPKG}
        rm -rf ${ZFSDIR}
-       tar xf ${ZFSSRC}
-       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
-       cd ${ZFSDIR}; quilt push -a
-       cd ${ZFSDIR}; rm -rf .pc ./patches
-       cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us 
-
-.PHONY: download
-download:
-       rm -rf pkg-spl pkg-zfs ${SPLSRC} ${ZFSSRC}
-       # clone pkg-zfsonlinux/spl and checkout 0.6.5.9-1
-       git clone -b debian/0.6.5.9-1 git://anonscm.debian.org/pkg-zfsonlinux/spl.git pkg-spl
-       # clone pkg-zfsonlinux/zfs and checkout 0.6.5.9-2
-       git clone -b debian/0.6.5.9-2 git://anonscm.debian.org/pkg-zfsonlinux/zfs.git pkg-zfs
-       tar czf ${SPLSRC} pkg-spl
-       tar czf ${ZFSSRC} pkg-zfs
+       mkdir ${ZFSDIR}
+       cp -a ${ZFSSRC}/* ${ZFSDIR}/
+       cp -a ${ZFSPKG} ${ZFSDIR}/debian
+
 
 .PHONY: clean
 clean:         
-       rm -rf *~ *.deb *.changes ${ZFSDIR} ${SPLDIR}
+       rm -rf *~ *.deb *.changes *.buildinfo *.dsc *.orig.tar.* *.debian.tar.* ${ZFSDIR} ${SPLDIR}
 
 .PHONY: distclean
 distclean: clean
 
-
 .PHONY: upload
 upload: ${DEBS}
-       tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch amd64
+       tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg --dist stretch --arch amd64