bump version to 2.1.3-pve1

[zfsonlinux.git] / Makefile

diff --git a/Makefile b/Makefile
index cd254e2cd9565ef2650628ce3b3fb8874ab4bb9c..d53d9db2394fd08300be7d34b0a4b6922b3f3dd0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,93 +1,82 @@
-RELEASE=3.3
-
 # source form https://github.com/zfsonlinux/
 
-ZFSVER=0.6.3-1.2
-PKGREL=2~wheezy
-PKGVER=0.6.3-${PKGREL}
-
-SPLDIR=spl-spl-${ZFSVER}
-SPLSRC=spl-${ZFSVER}.tar.gz
-ZFSDIR=zfs-zfs-${ZFSVER}
-ZFSSRC=zfs-${ZFSVER}.tar.gz
-
-SPL_DEBS=                      \
-spl_${PKGVER}_amd64.deb
-
-ZFS_DEBS=                              \
-libnvpair1_${PKGVER}_amd64.deb                 \
-libuutil1_${PKGVER}_amd64.deb          \
-libzfs2_${PKGVER}_amd64.deb            \
-libzfs-dev_${PKGVER}_amd64.deb         \
-libzpool2_${PKGVER}_amd64.deb          \
-zfs-doc_${PKGVER}_amd64.deb            \
-zfs-initramfs_${PKGVER}_amd64.deb      \
-zfsutils_${PKGVER}_amd64.deb
-
-DEBS=${SPL_DEBS} ${ZFS_DEBS} 
-
-all: ${DEBS}
+ZFSPKG=debian
+ZFSVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion | cut -d- -f1
+ZFSPKGVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion
+ZFSDIR=zfs-linux_${ZFSVER}
+ZFSSRC=upstream
+
+ZFS_DEB1= libnvpair3linux_${ZFSPKGVER}_amd64.deb
+
+ZFS_DEB_BINARY =                               \
+libpam-zfs_${ZFSPKGVER}_amd64.deb              \
+libuutil3linux_${ZFSPKGVER}_amd64.deb          \
+libzfs4linux_${ZFSPKGVER}_amd64.deb            \
+libzfsbootenv1linux_${ZFSPKGVER}_amd64.deb     \
+libzpool5linux_${ZFSPKGVER}_amd64.deb          \
+zfs-test_${ZFSPKGVER}_amd64.deb                        \
+zfsutils-linux_${ZFSPKGVER}_amd64.deb          \
+zfs-zed_${ZFSPKGVER}_amd64.deb
+
+ZFS_DBG_DEBS = $(patsubst %_${ZFSPKGVER}_amd64.deb, %-dbgsym_${ZFSPKGVER}_amd64.deb, ${ZFS_DEB1} ${ZFS_DEB_BINARY})
+
+ZFS_DEB2= ${ZFS_DEB_BINARY}                    \
+libzfslinux-dev_${ZFSPKGVER}_amd64.deb         \
+python3-pyzfs_${ZFSPKGVER}_amd64.deb           \
+pyzfs-doc_${ZFSPKGVER}_all.deb                 \
+spl_${ZFSPKGVER}_all.deb                       \
+zfs-initramfs_${ZFSPKGVER}_all.deb
+DEBS= ${ZFS_DEB1} ${ZFS_DEB2} ${ZFS_DBG_DEBS}
+
+ZFS_DSC = zfs-linux_${ZFSPKGVER}.dsc
+
+all: deb
+.PHONY: deb
+deb: ${DEBS}
+.PHONY: dsc
+dsc: ${ZFS_DSC}
+
+# called from pve-kernel's Makefile to get patched sources
+.PHONY: kernel
+kernel: dsc
+       dpkg-source -x ${ZFS_DSC} ../pkg-zfs
+       ${MAKE} -C ../pkg-zfs -f debian/rules adapt_meta_file
 
 .PHONY: dinstall
 dinstall: ${DEBS}
        dpkg -i ${DEBS}
 
-.PHONY: spl
-spl ${SPL_DEBS}: ${SPLSRC}
-       rm -rf ${SPLDIR}
-       tar xf ${SPLSRC}
-       cp -a spl-debian-pve ${SPLDIR}/debian
-       cd ${SPLDIR}; dpkg-buildpackage -b -uc -us 
+.PHONY: submodule
+submodule:
+       test -f "${ZFSSRC}/README.md" || git submodule update --init
+${ZFSSRC}/README.md: submodule
 
 .PHONY: zfs
-zfs ${ZFS_DEBS}: ${ZFSSRC}
-       rm -rf ${ZFSDIR}
-       tar xf ${ZFSSRC}
-       cp -a zfs-debian-pve ${ZFSDIR}/debian
-       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}
+zfs: ${DEBS}
+${ZFS_DEB2}: ${ZFS_DEB1}
+${ZFS_DEB1}: ${ZFSDIR}
+       cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
+       lintian ${DEBS}
+
+${ZFS_DSC}: ${ZFSDIR}
+       tar czf zfs-linux_${ZFSVER}.orig.tar.gz ${ZFSDIR}
+       cd ${ZFSDIR}; dpkg-buildpackage -S -uc -us -d
+       lintian $@
+
+${ZFSDIR}: ${ZFSSRC}/README.md ${ZFSSRC} ${ZFSPKG}
+       rm -rf ${ZFSDIR} ${ZFSDIR}.tmp
+       cp -a ${ZFSSRC} ${ZFSDIR}.tmp
+       cp -a ${ZFSPKG} ${ZFSDIR}.tmp/debian
+       mv ${ZFSDIR}.tmp ${ZFSDIR}
+
 
 .PHONY: clean
 clean:         
-       rm -rf *~ *.deb *.changes ${ZFSDIR} ${SPLDIR}
+       rm -rf *~ *.deb *.changes *.buildinfo *.dsc *.orig.tar.* *.debian.tar.* ${ZFSDIR}
 
 .PHONY: distclean
 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,pmg,pbs --dist bullseye --arch amd64