X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=527edb5c38db201d9b1db86da5ffd5a4344b98de;hb=e085fe6f9f4afcaf08c739a5b45cf26632e0bfb4;hp=073ddc8e044f2ce9317200321155d2c0200d3603;hpb=56f6a564000ab761261d3b93ac65aa1e14e3dea7;p=pve-cluster.git

diff --git a/Makefile b/Makefile
index 073ddc8..527edb5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,14 @@
+include /usr/share/dpkg/pkg-info.mk
+include /usr/share/dpkg/architecture.mk
+
 PACKAGE=pve-cluster
-PKGVER=5.0
-PKGREL=15
 
-ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-GITVERSION:=$(shell cat .git/refs/heads/master)
+GITVERSION:=$(shell git rev-parse HEAD)
 
-DEB=${PACKAGE}_${PKGVER}-${PKGREL}_${ARCH}.deb
-DBG_DEB=${PACKAGE}-dbg_${PKGVER}-${PKGREL}_${ARCH}.deb
+DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
+LIBDEB  = libpve-cluster-perl_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
+LIBDEB += libpve-cluster-api-perl_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
+DBGDEB=${PACKAGE}-dbgsym_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
 
 PERL_APIVER := `perl -MConfig -e 'print $$Config{debian_abi}//$$Config{version};'`
 
@@ -16,27 +18,25 @@ cpgtest: cpgtest.c
 	gcc -Wall cpgtest.c $(shell pkg-config --cflags --libs libcpg libqb) -o cpgtest
 
 .PHONY: dinstall
-dinstall: ${DEB}
-	dpkg -i ${DEB} 
+dinstall: ${DEB} ${LIBDEB}
+	dpkg -i $^
 
 .PHONY: deb
-deb ${DBG_DEB}: ${DEB}
+deb ${DBG_DEB} ${LIBDEB}: ${DEB}
 ${DEB}:
 	rm -f *.deb
 	rm -rf build
 	cp -a data build
 	cp -a debian build/debian
-	sed -e "s|@PERLAPI@|perlapi-$(PERL_APIVER)|g" debian/control.in > build/debian/control
 	echo "git clone git://git.proxmox.com/git/pve-cluster.git\\ngit checkout ${GITVERSION}" > build/debian/SOURCE
-	cd build; ./autogen.sh
 	cd build; dpkg-buildpackage -rfakeroot -b -us -uc
 	lintian ${DEB}
 
 
 .PHONY: upload
-upload: ${DEB} ${DBG_DEB}
-	tar cf - ${DEB} ${DBG_DEB}| ssh repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch ${ARCH}
+upload: ${DEB} ${DBG_DEB} ${LIBDEB}
+	tar cf - ${DEB} ${DBGDEB} ${LIBDEB}| ssh -X repoman@repo.proxmox.com -- upload --product pve --dist buster --arch ${DEB_BUILD_ARCH}
 
 .PHONY: clean
 clean:
-	rm -rf *~ build *_${ARCH}.deb *.changes *.dsc ${CSDIR} *.buildinfo
+	rm -rf *~ build *.deb *.changes *.dsc ${CSDIR} *.buildinfo