From 231e6a6e7b0710bfa066e6cf962edd20cb352c94 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Fri, 26 May 2023 17:10:46 +0200 Subject: [PATCH] buildsys: use full DEB_VERSION and correct DEB_HOST_ARCH Signed-off-by: Thomas Lamprecht --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 2860864..ee0510e 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,12 @@ include /usr/share/dpkg/architecture.mk PACKAGE=proxmox-mail-forward BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION) +DSC=rust-$(PACKAGE)_$(DEB_VERSION_UPSTREAM).dsc +DEB=$(PACKAGE)_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb +DBG_DEB=$(PACKAGE)-dbgsym_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb + +DEBS=$(DEB) $(DBG_DEB) + ifeq ($(BUILD_MODE), release) CARGO_BUILD_ARGS += --release COMPILEDIR := target/release @@ -13,12 +19,6 @@ endif CARGO ?= cargo -DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb -DBG_DEB=$(PACKAGE)-dbgsym_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb -DSC=rust-$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc - -DEBS=$(DEB) $(DBG_DEB) - $(BUILDDIR): rm -rf $@ $@.tmp && mkdir $@.tmp cp -a debian Cargo.toml src Makefile .cargo $@.tmp @@ -54,7 +54,7 @@ install: cargo-build .PHONY: upload upload: $(DEBS) - tar cf - $(DEBS) | ssh -X repoman@repo.proxmox.com -- upload --product "pve,pbs" --dist bullseye --arch $(DEB_BUILD_ARCH) + tar cf - $(DEBS) | ssh -X repoman@repo.proxmox.com -- upload --product "pve,pbs" --dist bullseye --arch $(DEB_HOST_ARCH) .PHONY: distclean distclean: clean