datacenter.cfg: fix fall back for undefined config

[pve-cluster.git] / Makefile

diff --git a/Makefile b/Makefile
index ef6dcd32cd0991cb23aa42433e6098a3f60cb519..ea4c36a8aa032a75f051a8df0775bad1db0349fa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,16 @@
+include /usr/share/dpkg/pkg-info.mk
+include /usr/share/dpkg/architecture.mk
+
 PACKAGE=pve-cluster
-PKGVER=5.0
-PKGREL=20
 
-ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell git rev-parse HEAD)
 
-DEB=${PACKAGE}_${PKGVER}-${PKGREL}_${ARCH}.deb
-DBG_DEB=${PACKAGE}-dbgsym_${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
+
+DEBS = ${DEB} ${DBG_DEB} ${LIBDEB}
 
 PERL_APIVER := `perl -MConfig -e 'print $$Config{debian_abi}//$$Config{version};'`
 
@@ -16,26 +20,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; 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: ${DEBS}
+       tar cf - ${DEBS} | ssh -X repoman@repo.proxmox.com -- upload --product pve --dist bullseye --arch ${DEB_BUILD_ARCH}
 
 .PHONY: clean
 clean:
-       rm -rf *~ build *_${ARCH}.deb *.changes *.dsc ${CSDIR} *.buildinfo
+       rm -rf *~ build *.deb *.changes *.dsc *.buildinfo