buildsys: fix source tarball generation directory level one-off

[corosync-pve.git] / Makefile

diff --git a/Makefile b/Makefile
index a1176ac1b416e02f12249a8b3ec8bed72c5c41e5..c35b1a9e32b00ae898d5ed557884cc35a21d3825 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,16 @@
-include /usr/share/dpkg/pkg-info.mk
-include /usr/share/dpkg/architecture.mk
+include /usr/share/dpkg/default.mk
 
 PACKAGE=corosync
 
 CSVERSION=$(DEB_VERSION_UPSTREAM)
 
 BUILDDIR=$(PACKAGE)-$(CSVERSION)
+ORIG_SRC_TAR=$(PACKAGE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz
 CSSRC=upstream
 
 GITVERSION:=$(shell git rev-parse HEAD)
 
+DSC=$(PACKAGE)_$(DEB_VERSION).dsc
 MAIN_DEB=corosync_$(DEB_VERSION)_$(DEB_BUILD_ARCH).deb \
 
 OTHER_DEBS=\
@@ -43,8 +44,6 @@ libvotequorum8-dbgsym_$(DEB_VERSION)_$(DEB_BUILD_ARCH).deb \
 
 DEBS=$(MAIN_DEB) $(OTHER_DEBS) $(DBG_DEBS)
 
-DSC=corosync-pve_$(DEB_VERSION).dsc
-
 all: $(DEBS)
        echo $(DEBS)
 
@@ -60,24 +59,31 @@ $(OTHER_DEBS) $(DBG_DEBS): $(MAIN_DEB)
 $(MAIN_DEB): $(BUILDDIR)
        cd $(BUILDDIR); dpkg-buildpackage -b -us -uc
 
+$(ORIG_SRC_TAR): $(BUILDDIR)
+       tar czf $(ORIG_SRC_TAR) --exclude="$(BUILDDIR)/debian" $(BUILDDIR)
+
 .PHONY: dsc
 dsc: $(DSC)
-$(DSC): $(BUILDDIR)
-       cd $(BUILDDIR); dpkg-buildpackage -S -us -uc -d -nc
+$(DSC): $(ORIG_SRC_TAR) $(BUILDDIR)
+       cd $(BUILDDIR); dpkg-buildpackage -S -us -uc -d
+       lintian $(DSC)
+
+sbuild: $(DSC)
+       sbuild $(DSC)
 
 .PHONY: submodule
 submodule:
        test -f "$(CSSRC)/INSTALL" || git submodule update --init $(CSSRC)
 
 .PHONY: upload
+upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
 upload: $(DEBS)
-       tar cf - $(DEBS) | ssh -X repoman@repo.proxmox.com -- upload --product pve --dist bookworm --arch $(DEB_BUILD_ARCH)
+       tar cf - $(DEBS) | ssh -X repoman@repo.proxmox.com -- upload --product pve --dist $(UPLOAD_DIST) --arch $(DEB_BUILD_ARCH)
 
 .PHONY: clean
 distclean: clean
 clean:
-       rm -rf *.deb *.changes *.dsc *.buildinfo $(BUILDDIR)
-       find . -name '*~' -exec rm () ';'
+       rm -rf *.deb *.changes *.dsc *.buildinfo *.build $(PACKAGE)-[0-9]*/ *.tar.?z
 
 .PHONY: dinstall
 dinstall: $(DEBS)