From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 32D2B1FF177 for ; Fri, 2 Aug 2024 15:28:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 162EBDF8C; Fri, 2 Aug 2024 15:28:26 +0200 (CEST) From: Max Carrara To: pve-devel@lists.proxmox.com Date: Fri, 2 Aug 2024 15:26:55 +0200 Message-Id: <20240802132656.270077-18-m.carrara@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240802132656.270077-1-m.carrara@proxmox.com> References: <20240802132656.270077-1-m.carrara@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.034 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH v1 pve-common 17/18] make: support building multiple packages from the same source X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" This also makes sure that `lintian` actually lints any new packages. Signed-off-by: Max Carrara --- Makefile | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 637cd49..c2969aa 100644 --- a/Makefile +++ b/Makefile @@ -1,20 +1,24 @@ include /usr/share/dpkg/pkg-info.mk -PACKAGE=libpve-common-perl +SOURCE_PACKAGE=libpve-common-perl + +PACKAGES = \ + $(SOURCE_PACKAGE) \ + ARCH=all -BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM) +BUILDDIR ?= $(SOURCE_PACKAGE)-$(DEB_VERSION_UPSTREAM) -DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_$(ARCH).deb -DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc +DEBS = $(addsuffix _$(DEB_VERSION_UPSTREAM_REVISION)_$(ARCH).deb,$(PACKAGES)) +DSC=$(SOURCE_PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc all: $(MAKE) -C src .PHONY: dinstall dinstall: deb - dpkg -i $(DEB) + dpkg -i $(DEBS) $(BUILDDIR): src debian test rm -rf $(BUILDDIR) $(BUILDDIR).tmp; mkdir $(BUILDDIR).tmp @@ -23,10 +27,10 @@ $(BUILDDIR): src debian test mv $(BUILDDIR).tmp $(BUILDDIR) .PHONY: deb -deb: $(DEB) -$(DEB): $(BUILDDIR) +deb: $(DEBS) +$(DEBS): $(BUILDDIR) cd $(BUILDDIR); dpkg-buildpackage -b -us -uc - lintian $(DEB) + lintian $(DEBS) .PHONY: dsc dsc: $(DSC) @@ -40,7 +44,7 @@ sbuild: $(DSC) .PHONY: clean distclean distclean: clean clean: - rm -rf *~ *.deb *.changes $(PACKAGE)-[0-9]*/ *.buildinfo *.build *.dsc *.tar.?z + rm -rf *~ *.deb *.changes $(SOURCE_PACKAGE)-[0-9]*/ *.buildinfo *.build *.dsc *.tar.?z .PHONY: check check: @@ -52,5 +56,5 @@ install: .PHONY: upload upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION) -upload: $(DEB) - tar cf - $(DEB)|ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg --dist $(UPLOAD_DIST) +upload: $(DEBS) + tar cf - $(DEBS)|ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg --dist $(UPLOAD_DIST) -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel