From 810ebdb452969733b52b05e9736b8577465adbc5 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 21 May 2019 18:07:41 +0200 Subject: [PATCH] buildsys: use dpkg-dev Makefile helpers for pkg info Signed-off-by: Thomas Lamprecht --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 233092d..9a567d6 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,12 @@ +include /usr/share/dpkg/pkg-info.mk +include /usr/share/dpkg/architecture.mk + PACKAGE=pve-cluster -PKGVER=5.0 -PKGREL=37 -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 +DBGDEB=${PACKAGE}-dbgsym_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb PERL_APIVER := `perl -MConfig -e 'print $$Config{debian_abi}//$$Config{version};'` @@ -34,8 +34,8 @@ ${DEB}: .PHONY: upload upload: ${DEB} ${DBG_DEB} - tar cf - ${DEB} ${DBG_DEB}| ssh -X repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch ${ARCH} + tar cf - ${DEB} ${DBG_DEB}| ssh -X repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch ${DEB_BUILD_ARCH} .PHONY: clean clean: - rm -rf *~ build *_${ARCH}.deb *.changes *.dsc ${CSDIR} *.buildinfo + rm -rf *~ build *.deb *.changes *.dsc ${CSDIR} *.buildinfo -- 2.39.5