From 0d7181b2611432847f91f73a2c70a7d4a960e542 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Mon, 26 Jun 2023 11:36:38 +0200 Subject: [PATCH] buildsys: build-dir: split-out and generate atomically Signed-off-by: Thomas Lamprecht --- Makefile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 02dd4c1..b2d2078 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ include /usr/share/dpkg/pkg-info.mk PACKAGE=pmg-api -BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM) +BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION) DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb @@ -13,14 +13,18 @@ export REPOID export PMGVERSION = $(DEB_VERSION_UPSTREAM_REVISION) export PMGRELEASE = $(DEB_VERSION_UPSTREAM) +$(BUILDDIR): src debian + rm -rf $@ $@.tmp + cp -a src $@.tmp + cp -a debian $@.tmp/ + mv $@.tmp $@ + .PHONY: deb -deb $(DEB): - rm -rf $(BUILDDIR) - rsync -a src/ debian $(BUILDDIR) +deb: $(DEB) +$(DEB): $(BUILDDIR) cd $(BUILDDIR); dpkg-buildpackage -b -us -uc lintian $(DEB) - .PHONY: upload upload: $(DEB) tar cf - $(DEB) | ssh -X repoman@repo.proxmox.com -- upload --product pmg --dist bullseye -- 2.39.2