update to 1.29b-2+pve.1 and buildfiles for pve 5

[tar.git] / Makefile

diff --git a/Makefile b/Makefile
index 1da86882c56e76add47e795a6636646577c576a8..d582868c5730b850062461d907957afadde69294 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,6 @@
-RELEASE=4.1
-
-# Note: compile as root fail, so you need to do that as unpriv. user
-
-TARVER=1.27.1
+TARVER=1.29b
 DEBREL=2
-PVETARVER=${TARVER}+pve.3
+PVETARVER=${TARVER}+pve.1
 
 # also update changelog
 
@@ -24,28 +20,27 @@ all: deb
 dinstall: ${DEB}
        dpkg -i ${DEB}
 
-.PHONY: deb
-deb ${DEB}: ${TARSRC}
+.PHONY: prepare
+prepare: $(TARDIR)
+$(TARDIR): $(TARSRC) $(TARDEBSRC)
        rm -rf ${TARDIR}
        tar xf ${TARSRC}
-       cd ${TARDIR}; tar xf ../${TARDEBSRC}
+       tar -C $(TARDIR) -xf $(TARDEBSRC)
        echo "${SOURCETXT}" > ${TARDIR}/debian/SOURCE
        echo "debian/SOURCE" >>${TARDIR}/debian/docs
        mv ${TARDIR}/debian/changelog ${TARDIR}/debian/changelog.org
        cat changelog ${TARDIR}/debian/changelog.org >${TARDIR}/debian/changelog
-       cd ${TARDIR}; patch -p1 <../acls-bugfix.patch
-       cd ${TARDIR}; dpkg-buildpackage -b -uc -us
+       cd ${TARDIR} && patch -p1 -i ../sparse-unicode.patch
+
+.PHONY: deb
+deb: $(DEB)
+$(DEB): $(TARDIR)
+       cd ${TARDIR} && dpkg-buildpackage -b -uc -us
 
 .PHONY: upload
-upload:
-       umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
-       mkdir -p /pve/${RELEASE}/extra
-       rm -rf /pve/${RELEASE}/extra/tar_*.deb
-       rm -rf /pve/${RELEASE}/extra/Packages*
-       cp ${DEB} /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
+upload: $(DEB)
+       tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve --dist stretch
 
 .PHONY: clean
 clean:
-       rm -rf *~ *_${ARCH}.deb *_all.deb *_${ARCH}.udeb *.changes *.dsc ${TARDIR}
+       rm -rf *~ *_${ARCH}.deb *_all.deb *_${ARCH}.udeb *.changes *.buildinfo *.dsc ${TARDIR}