From 0ac0c01b146752cebda522106028aa195eaef1bf Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 22 May 2019 21:15:47 +0200 Subject: [PATCH] buildsys: use dpkg-dev makefile helpers for pkg info Signed-off-by: Thomas Lamprecht (cherry picked from commit bcef9bde68a920a4d204beb8ec1d5f334f7fbb78) Signed-off-by: Thomas Lamprecht --- Makefile | 7 ++++--- defines.mk | 2 -- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 3471f009..9d801c89 100644 --- a/Makefile +++ b/Makefile @@ -1,18 +1,19 @@ +include /usr/share/dpkg/pkg-info.mk +include /usr/share/dpkg/architecture.mk include defines.mk -export SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog -STimestamp) +export VERSION=${DEB_VERSION_UPSTREAM} DESTDIR= SUBDIRS = aplinfo PVE bin www services configs network-hooks test -ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) GITVERSION:=$(shell git rev-parse HEAD) # possibly set via debian/rules(.env) REPOID?=$(shell git rev-parse --short=8 HEAD) -DEB=${PACKAGE}_${VERSION}-${PACKAGERELEASE}_${ARCH}.deb +DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb all: ${SUBDIRS} set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i; done diff --git a/defines.mk b/defines.mk index 619ccb68..ab77b4ba 100644 --- a/defines.mk +++ b/defines.mk @@ -1,6 +1,4 @@ -VERSION=5.4 PACKAGE=pve-manager -PACKAGERELEASE=11 BINDIR=${DESTDIR}/usr/bin PERLLIBDIR=${DESTDIR}/usr/share/perl5