From: Thomas Lamprecht Date: Mon, 22 May 2023 12:45:19 +0000 (+0200) Subject: buildsys: use full DEB_VERSION and correct DEB_HOST_ARCH X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=22b180a18039efe10b61e9822af00293ceec78b8;p=pve-firewall.git buildsys: use full DEB_VERSION and correct DEB_HOST_ARCH The DEB_BUILD_ARCH is the one from the build host, the DEB_HOST_ARCH is the one the package is build for, so the latter is the correct one here. Signed-off-by: Thomas Lamprecht --- diff --git a/Makefile b/Makefile index 4640c01..5d19f38 100644 --- a/Makefile +++ b/Makefile @@ -3,12 +3,12 @@ include /usr/share/dpkg/architecture.mk PACKAGE=pve-firewall -BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM) +BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION) GITVERSION:=$(shell git rev-parse HEAD) -DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb -DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc -DEB2=$(PACKAGE)-dbgsym_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb +DEB=$(PACKAGE)_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb +DSC=$(PACKAGE)_$(DEB_VERSION).dsc +DEB2=$(PACKAGE)-dbgsym_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb DEBS=$(DEB) $(DEB2) all: $(DEBS) @@ -48,4 +48,4 @@ clean: .PHONY: upload upload: $(DEBS) - tar cf - $(DEBS) | ssh repoman@repo.proxmox.com -- upload --product pve --dist bullseye --arch $(DEB_BUILD_ARCH) + tar cf - $(DEBS) | ssh repoman@repo.proxmox.com -- upload --product pve --dist bullseye --arch $(DEB_HOST_ARCH)