X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=89fa8a486c01dee0d181ffb1ae513d7fd6ddf05c;hb=e3e02f46886b397d1f6cd87a781038721e5e8197;hp=23506578f4c3bce5c948a301720a8ca4303000d2;hpb=e6649ff93edc5839a2d84ab46222ee99ab292199;p=pve-ha-manager.git

diff --git a/Makefile b/Makefile
index 2350657..89fa8a4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,9 @@
-RELEASE=4.1
-
-VERSION=1.0
+VERSION=2.0
 PACKAGE=pve-ha-manager
 SIMPACKAGE=pve-ha-simulator
-PKGREL=14
+PKGREL=6
 
-GITVERSION:=$(shell cat .git/refs/heads/master)
+GITVERSION:=$(shell git rev-parse HEAD)
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
@@ -13,39 +11,28 @@ DEB=${PACKAGE}_${VERSION}-${PKGREL}_${ARCH}.deb
 SIMDEB=${SIMPACKAGE}_${VERSION}-${PKGREL}_all.deb
 
 
-all: ${DEB} ${SIMDEB}
+all: deb
 
-.PHONY: dinstall simdeb
-dinstall: deb simdeb
+.PHONY: dinstall
+dinstall: $(DEB) $(SIMDEB)
 	dpkg -i ${DEB} ${SIMDEB}
 
-
-.PHONY: simdeb ${SIMDEB}
-simdeb ${SIMDEB}:
-	rm -rf build
-	mkdir build
-	rsync -a src/ build
-	rsync -a simdebian/ build/debian
-	cp changelog.Debian build/debian/changelog
-	echo "git clone git://git.proxmox.com/git/pve-ha-manager.git\\ngit checkout ${GITVERSION}" > build/debian/SOURCE
-	cd build; dpkg-buildpackage -rfakeroot -b -us -uc
-	lintian ${SIMDEB}
-
-.PHONY: deb ${DEB}
-deb ${DEB}:
+.PHONY: deb
+deb: ${DEB} ${SIMDEB}
+${DEB}:
 	rm -rf build
 	mkdir build
 	rsync -a src/ build
 	rsync -a debian/ build/debian
-	cp changelog.Debian build/debian/changelog
 	echo "git clone git://git.proxmox.com/git/pve-ha-manager.git\\ngit checkout ${GITVERSION}" > build/debian/SOURCE
-	cd build; dpkg-buildpackage -rfakeroot -b -us -uc
+	cd build; dpkg-buildpackage -b -us -uc
 	lintian ${DEB}
+	lintian ${SIMDEB}
 
 .PHONY: clean
 clean:
 	make -C src clean
-	rm -rf build *.deb ${PACKAGE}-*.tar.gz *.changes 
+	rm -rf build *.deb ${PACKAGE}-*.tar.gz *.changes *.buildinfo
 	find . -name '*~' -exec rm {} ';'
 
 .PHONY: distclean
@@ -53,12 +40,5 @@ distclean: clean
 
 .PHONY: upload
 upload: ${DEB} ${SIMDEB}
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
-	mkdir -p /pve/${RELEASE}/extra
-	rm -f /pve/${RELEASE}/extra/${PACKAGE}_*.deb
-	rm -f /pve/${RELEASE}/extra/${SIMPACKAGE}_*.deb
-	rm -f /pve/${RELEASE}/extra/Packages*
-	cp ${DEB} ${SIMDEB} /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 - ${DEB} ${SIMDEB}|ssh repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch ${ARCH}