From 9e7376675dd9422242601fe76dd92f4519e424d8 Mon Sep 17 00:00:00 2001 From: Stoiko Ivanov Date: Mon, 19 Jun 2023 19:59:32 +0200 Subject: [PATCH] buildsys: make build-dir generation atomic Signed-off-by: Stoiko Ivanov Signed-off-by: Thomas Lamprecht --- Makefile | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 886b54b..facc154 100644 --- a/Makefile +++ b/Makefile @@ -4,13 +4,14 @@ PACKAGE=proxmox-mailgateway GITVERSION:=$(shell git rev-parse HEAD) +BUILDDIR=$(PACKAGE)-$(DEB_VERSION) + DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb CT_DEB=$(PACKAGE)-container_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb HEADER_DEB=pve-headers_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb DEBS=$(DEB) $(CT_DEB) $(HEADER_DEB) -BUILD_DIR=build ARCH=amd64 @@ -18,12 +19,16 @@ all: $(DEB) .PHONY: deb deb $(CT_DEB) $(HEADER_DEB): $(DEB) -$(DEB): debian - rm -rf $(BUILD_DIR) - mkdir -p $(BUILD_DIR)/debian - cp -ar debian/* $(BUILD_DIR)/debian/ - echo "git clone git://git.proxmox.com/git/proxmox-mailgateway.git\\ngit checkout $(GITVERSION)" > $(BUILD_DIR)/debian/SOURCE - cd $(BUILD_DIR); dpkg-buildpackage -b -uc -us + +$(BUILDDIR): debian + rm -rf $@ $@.tmp + mkdir -p $@.tmp/debian + cp -a debian/ $@.tmp/ + echo "git clone git://git.proxmox.com/git/proxmox-mailgateway.git\\ngit checkout $(GITVERSION)" > $@.tmp/debian/SOURCE + mv $@.tmp $@ + +$(DEB): $(BUILDDIR) + cd $(BUILDDIR); dpkg-buildpackage -b -uc -us lintian $(DEBS) .PHONY: upload @@ -31,5 +36,5 @@ upload: $(DEBS) tar cf - $(DEBS)|ssh -X repoman@repo.proxmox.com -- upload --product pmg --dist bullseye --arch $(ARCH) clean: - rm -rf $(BUILD_DIR) *.deb *.buildinfo *.changes + rm -rf $(PACKAGE)-[0-9]*/ *.deb *.buildinfo *.changes find . -name '*~' -exec rm {} ';'