debian: switch to DH 10

[zfsonlinux.git] / Makefile

diff --git a/Makefile b/Makefile
index 9b0ff118e370cee1def65f5fb926b9bf0dbe2ba4..78a834a02484c37011f44fa394702e9115fe6745 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.11
-ZFSPKGREL=pve18~bpo90
-SPLPKGREL=pve10~bpo90
+ZFSVER=0.7.12
+ZFSPKGREL=pve1~bpo1
+SPLPKGREL=pve1~bpo1
 ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
 SPLPKGVER=${ZFSVER}-${SPLPKGREL}
 
-SPLDIR=spl-build
-SPLSRC=spl-debian
-ZFSDIR=zfs-build
-ZFSSRC=zfs-debian
+SPLDIR=spl-${ZFSVER}
+SPLSRC=spl/upstream
+SPLPKG=spl/debian
+ZFSDIR=zfs-${ZFSVER}
+ZFSSRC=zfs/upstream
+ZFSPKG=zfs/debian
 
-SPL_DEBS=                                      \
+SPL_DEB =                                      \
 spl_${SPLPKGVER}_amd64.deb
 
-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,9 +27,11 @@ 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)
 
-DEBS=${SPL_DEBS} ${ZFS_DEBS}
+DEBS=${SPL_DEB} ${ZFS_DEBS}
 
 all: deb
 deb: ${DEBS}
@@ -38,32 +42,27 @@ dinstall: ${DEBS}
 
 .PHONY: submodule
 submodule:
-       test -f "${ZFSSRC}/debian/changelog" || git submodule update --init
-       test -f "${SPLSRC}/debian/changelog" || git submodule update --init
+       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}: ${SPLSRC}
        rm -rf ${SPLDIR}
        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
-       cd ${SPLDIR}; quilt push -a
-       cd ${SPLDIR}; rm -rf .pc ./patches
-       cd ${SPLDIR}; dpkg-buildpackage -b -uc -us 
+       cp -a ${SPLPKG} ${SPLDIR}/debian
+       cd ${SPLDIR}; dpkg-buildpackage -b -uc -us
 
 .PHONY: zfs
-zfs ${ZFS_DEBS} ${ZFS_TRANS_DEBS}: ${ZFSSRC}
+zfs: $(ZFS_DEBS)
+$(ZFS_DEB2): $(ZFS_DEB1)
+$(ZFS_DEB1): $(ZFSSRC)
        rm -rf ${ZFSDIR}
        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
-       cd ${ZFSDIR}; quilt push -a
-       cd ${ZFSDIR}; rm -rf .pc ./patches
-       cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us 
+       cp -a ${ZFSPKG} ${ZFSDIR}/debian
+       cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
 
 .PHONY: clean
 clean:         
@@ -72,7 +71,6 @@ clean:
 .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