bump version to 2.1.3-pve1

[zfsonlinux.git] / Makefile

diff --git a/Makefile b/Makefile
index b070797eb2fe42e545dd755f5d35ee03f216af28..d53d9db2394fd08300be7d34b0a4b6922b3f3dd0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,32 +1,38 @@
-RELEASE=5.1
-
 # source form https://github.com/zfsonlinux/
 
+ZFSPKG=debian
+ZFSVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion | cut -d- -f1
+ZFSPKGVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion
 ZFSDIR=zfs-linux_${ZFSVER}
-ZFSSRC=zfs/upstream
-ZFSPKG=zfs/debian
+ZFSSRC=upstream
 
-ZFSVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion | cut -d- -f1
+ZFS_DEB1= libnvpair3linux_${ZFSPKGVER}_amd64.deb
 
-ZFSPKGVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion
+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_DEB1= libnvpair1linux_${ZFSPKGVER}_amd64.deb
-ZFS_DEB2=                                      \
-libuutil1linux_${ZFSPKGVER}_amd64.deb          \
-libzfs2linux_${ZFSPKGVER}_amd64.deb            \
+ZFS_DEB2= ${ZFS_DEB_BINARY}                    \
 libzfslinux-dev_${ZFSPKGVER}_amd64.deb         \
-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)
+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: ${ZFS_DEBS}
+deb: ${DEBS}
 .PHONY: dsc
 dsc: ${ZFS_DSC}
 
@@ -34,7 +40,7 @@ dsc: ${ZFS_DSC}
 .PHONY: kernel
 kernel: dsc
        dpkg-source -x ${ZFS_DSC} ../pkg-zfs
-       $(MAKE) -C ../pkg-zfs -f debian/rules adapt_meta_file
+       ${MAKE} -C ../pkg-zfs -f debian/rules adapt_meta_file
 
 .PHONY: dinstall
 dinstall: ${DEBS}
@@ -42,25 +48,26 @@ dinstall: ${DEBS}
 
 .PHONY: submodule
 submodule:
-       test -f "${ZFSSRC}/README.markdown" || git submodule update --init
+       test -f "${ZFSSRC}/README.md" || git submodule update --init
+${ZFSSRC}/README.md: submodule
 
 .PHONY: zfs
-zfs: $(ZFS_DEBS)
-$(ZFS_DEB2): $(ZFS_DEB1)
-$(ZFS_DEB1): ${ZFSDIR}
+zfs: ${DEBS}
+${ZFS_DEB2}: ${ZFS_DEB1}
+${ZFS_DEB1}: ${ZFSDIR}
        cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
-       lintian ${ZFS_DEBS}
+       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) ${ZFSPKG}
-       rm -rf ${ZFSDIR}
-       mkdir ${ZFSDIR}
-       cp -a ${ZFSSRC}/* ${ZFSDIR}/
-       cp -a ${ZFSPKG} ${ZFSDIR}/debian
+${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
@@ -72,4 +79,4 @@ distclean: clean
 
 .PHONY: upload
 upload: ${DEBS}
-       tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg --dist buster --arch amd64
+       tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist bullseye --arch amd64