bump version to 0.7.11-pve1~bpo1

[zfsonlinux.git] / Makefile

diff --git a/Makefile b/Makefile
index 8660b1272d396e647b9d054f76ff08ab4d40f6da..4f4773bec325dbd8e446a296f9160797fd50ed73 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
-RELEASE=5.0
+RELEASE=5.1
 
 # source form https://github.com/zfsonlinux/
 
-ZFSVER=0.6.5.11
-ZFSPKGREL=pve17~bpo90
-SPLPKGREL=pve10~bpo90
+ZFSVER=0.7.11
+ZFSPKGREL=pve1~bpo1
+SPLPKGREL=pve1~bpo1
 ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
 SPLPKGVER=${ZFSVER}-${SPLPKGREL}
 
@@ -13,11 +13,11 @@ SPLSRC=spl-debian
 ZFSDIR=zfs-build
 ZFSSRC=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 +25,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}
@@ -42,7 +44,8 @@ submodule:
        test -f "${SPLSRC}/debian/changelog" || 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}/
@@ -51,10 +54,12 @@ spl ${SPL_DEBS}: ${SPLSRC}
        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 
+       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}/
@@ -63,7 +68,7 @@ zfs ${ZFS_DEBS} ${ZFS_TRANS_DEBS}: ${ZFSSRC}
        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 
+       cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
 
 .PHONY: clean
 clean:         
@@ -75,4 +80,4 @@ 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