X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=6461893411d16fea65d5e2f4020eb81463dcf7ca;hb=28f635be8c4973f7004a136e5da1663c4b305001;hp=b6a52c9453571406f43a0291f4322e11d3df2624;hpb=c0f28922e8ec63f7836b8235cfce7ed96b2a7d0a;p=zfsonlinux.git diff --git a/Makefile b/Makefile index b6a52c9..6461893 100644 --- a/Makefile +++ b/Makefile @@ -2,9 +2,9 @@ RELEASE=5.1 # source form https://github.com/zfsonlinux/ -ZFSVER=0.7.7 -ZFSPKGREL=pve2~bpo9 -SPLPKGREL=pve1~bpo9 +ZFSVER=0.7.12 +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 \ @@ -27,8 +27,9 @@ 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} @@ -43,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}/ @@ -55,7 +57,9 @@ spl ${SPL_DEBS}: ${SPLSRC} 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}/