bump ZFS version to 0.6.5.11-pve18

[zfsonlinux.git] / Makefile

diff --git a/Makefile b/Makefile
index bced982aaf38ca636627568a2361624cf3426aa9..9b0ff118e370cee1def65f5fb926b9bf0dbe2ba4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,67 +1,73 @@
-RELEASE=4.0
+RELEASE=5.0
 
 # source form https://github.com/zfsonlinux/
 
-ZFSVER=0.6.3-1.2
-ZFSPKGREL=pve2~jessie
-SPLPKGREL=pve1~jessie
-ZFSPKGVER=0.6.3-${ZFSPKGREL}
-SPLPKGVER=0.6.3-${SPLPKGREL}
+ZFSVER=0.6.5.11
+ZFSPKGREL=pve18~bpo90
+SPLPKGREL=pve10~bpo90
+ZFSPKGVER=${ZFSVER}-${ZFSPKGREL}
+SPLPKGVER=${ZFSVER}-${SPLPKGREL}
 
-SPLDIR=spl-spl-${ZFSVER}
-SPLSRC=spl-${ZFSVER}.tar.gz
-ZFSDIR=zfs-zfs-${ZFSVER}
-ZFSSRC=zfs-${ZFSVER}.tar.gz
+SPLDIR=spl-build
+SPLSRC=spl-debian
+ZFSDIR=zfs-build
+ZFSSRC=zfs-debian
 
-SPL_DEBS=                      \
+SPL_DEBS=                                      \
 spl_${SPLPKGVER}_amd64.deb
 
-ZFS_DEBS=                              \
-libnvpair1_${ZFSPKGVER}_amd64.deb              \
-libuutil1_${ZFSPKGVER}_amd64.deb               \
-libzfs2_${ZFSPKGVER}_amd64.deb         \
-libzfs-dev_${ZFSPKGVER}_amd64.deb              \
-libzpool2_${ZFSPKGVER}_amd64.deb               \
-zfs-doc_${ZFSPKGVER}_amd64.deb         \
-zfs-initramfs_${ZFSPKGVER}_amd64.deb   \
-zfsutils_${ZFSPKGVER}_amd64.deb
+ZFS_DEBS=                                      \
+libnvpair1linux_${ZFSPKGVER}_amd64.deb         \
+libuutil1linux_${ZFSPKGVER}_amd64.deb          \
+libzfs2linux_${ZFSPKGVER}_amd64.deb            \
+libzfslinux-dev_${ZFSPKGVER}_amd64.deb         \
+libzpool2linux_${ZFSPKGVER}_amd64.deb          \
+zfs-dbg_${ZFSPKGVER}_amd64.deb                 \
+zfs-zed_${ZFSPKGVER}_amd64.deb                 \
+zfs-initramfs_${ZFSPKGVER}_all.deb             \
+zfsutils-linux_${ZFSPKGVER}_amd64.deb
 
-DEBS=${SPL_DEBS} ${ZFS_DEBS} 
+DEBS=${SPL_DEBS} ${ZFS_DEBS}
 
-all: ${DEBS}
+all: deb
+deb: ${DEBS}
 
 .PHONY: dinstall
 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}
-       cp -a spl-debian-pve ${SPLDIR}/debian
+       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 
 
 .PHONY: zfs
-zfs ${ZFS_DEBS}: ${ZFSSRC}
+zfs ${ZFS_DEBS} ${ZFS_TRANS_DEBS}: ${ZFSSRC}
        rm -rf ${ZFSDIR}
-       tar xf ${ZFSSRC}
-       cp -a zfs-debian-pve ${ZFSDIR}/debian
+       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 
 
-.PHONY: download
-download:
-       #git clone https://github.com/zfsonlinux/pkg-spl.git
-       #git clone https://github.com/zfsonlinux/pkg-zfs.git
-       ##git checkout master/ubuntu/precise
-       ##git checkout master/debian/wheezy
-       rm spl-*.tar.gz
-       rm zfs-*.tar.gz
-       wget https://github.com/zfsonlinux/spl/archive/${SPLSRC}
-       wget https://github.com/zfsonlinux/zfs/archive/${ZFSSRC}
-
 .PHONY: clean
 clean:         
-       rm -rf *~ *.deb *.changes ${ZFSDIR} ${SPLDIR}
+       rm -rf *~ *.deb *.changes *.buildinfo ${ZFSDIR} ${SPLDIR}
 
 .PHONY: distclean
 distclean: clean
@@ -69,27 +75,4 @@ distclean: clean
 
 .PHONY: upload
 upload: ${DEBS}
-       umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
-       mkdir -p /pve/${RELEASE}/extra
-       rm -f /pve/${RELEASE}/extra/spl_*.deb
-       rm -f /pve/${RELEASE}/extra/spl-dkms_*.deb
-       rm -f /pve/${RELEASE}/extra/libnvpair1_*.deb
-       rm -f /pve/${RELEASE}/extra/libnvpair1-dbg_*.deb
-       rm -f /pve/${RELEASE}/extra/libuutil1_*.deb
-       rm -f /pve/${RELEASE}/extra/libuutil1-dbg_*.deb
-       rm -f /pve/${RELEASE}/extra/libzfs2_*.deb
-       rm -f /pve/${RELEASE}/extra/libzfs2-dbg_*.deb
-       rm -f /pve/${RELEASE}/extra/libzfs-dev_*.deb
-       rm -f /pve/${RELEASE}/extra/libzpool2_*.deb
-       rm -f /pve/${RELEASE}/extra/libzpool2-dbg_*.deb
-       rm -f /pve/${RELEASE}/extra/zfs_*.deb
-       rm -f /pve/${RELEASE}/extra/zfs-dkms_*.deb
-       rm -f /pve/${RELEASE}/extra/zfs-doc_*.deb
-       rm -f /pve/${RELEASE}/extra/zfs-initramfs_*.deb
-       rm -f /pve/${RELEASE}/extra/zfsutils_*.deb
-       rm -f /pve/${RELEASE}/extra/zfsutils-dbg_*.deb
-       rm -f /pve/${RELEASE}/extra/Packages*
-       cp ${DEBS} /pve/${RELEASE}/extra
-       cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz
-       umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
-
+       tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch amd64