bump version to 8.5.2-1+pve1

[frr.git] / Makefile

diff --git a/Makefile b/Makefile
index 700f152e61d69d291130217a386774206c365075..696a5b77e60f30b921326662b8f12e9d6be395b9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,19 +3,20 @@ include /usr/share/dpkg/default.mk
 PACKAGE=frr
 
 SRCDIR=frr
-BUILDDIR=build-$(PACKAGE)-$(DEB_VERSION_UPSTREAM)
+BUILDDIR=$(PACKAGE)-$(DEB_VERSION_UPSTREAM)
 
-GITVERSION:=$(shell git rev-parse HEAD)
+ORIG_SRC_TAR=$(PACKAGE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz
+DSC=$(PACKAGE)_$(DEB_VERSION).dsc
 
-MAIN_DEB=$(PACKAGE)_$(DEB_VERSION)_$(DEB_BUILD_ARCH).deb
+MAIN_DEB=$(PACKAGE)_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb
 OTHER_DEBS=\
   frr-doc_$(DEB_VERSION)_all.deb \
   frr-pythontools_$(DEB_VERSION)_all.deb \
-  frr-snmp_$(DEB_VERSION)_$(DEB_BUILD_ARCH).deb \
+  frr-snmp_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb \
 
 DBG_DEBS=\
-  frr-dbgsym_$(DEB_VERSION)_$(DEB_BUILD_ARCH).deb \
-  frr-snmp-dbgsym_$(DEB_VERSION)_$(DEB_BUILD_ARCH).deb \
+  frr-dbgsym_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb \
+  frr-snmp-dbgsym_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb \
 
 DEBS=$(MAIN_DEB) $(OTHER_DEBS) $(DBG_DEBS)
 
@@ -26,12 +27,18 @@ all: $(DEBS)
 submodule:
        test -f "$(SRCDIR)/debian/changelog" || git submodule update --init
 
+# FIXME: fully merge our and upstream (which is also the upstream for debian's "downstream") packaging
+# so that the top-level debian directory is the canonical source.
 $(BUILDDIR): submodule debian/changelog
-       rm -rf $(BUILDDIR) $(BUILDDIR).tmp
-       cp -a $(SRCDIR) $(BUILDDIR).tmp
-       rm $(BUILDDIR).tmp/debian/changelog
-       cp -a debian/* $(BUILDDIR).tmp/debian/
-       mv $(BUILDDIR).tmp $(BUILDDIR)
+       rm -rf $@ $@.tmp
+       cp -a $(SRCDIR) $@.tmp
+       rm $@.tmp/debian/changelog $@.tmp/debian/compat
+       sed -i '/frrinit\.sh/d' $@.tmp/debian/rules
+       cp -a debian/* $@.tmp/debian/
+       mv $@.tmp $@
+
+$(ORIG_SRC_TAR): $(BUILDDIR)
+       tar czf $(ORIG_SRC_TAR) --exclude="$(BUILDDIR)/debian" $(BUILDDIR)
 
 .PHONY: deb
 deb: $(DEBS)
@@ -40,16 +47,30 @@ $(MAIN_DEB): $(BUILDDIR)
        cd $(BUILDDIR); dpkg-buildpackage -b -uc -us --build-profiles="pkg.frr.nortrlib"
        lintian $(DEBS)
 
+.PHONY: dsc
+dsc:
+       rm -rf $(BUILDDIR) $(ORIG_SRC_TAR) $(DSC)
+       $(MAKE) $(DSC)
+       lintian $(DSC)
+
+$(DSC): $(BUILDDIR) $(ORIG_SRC_TAR)
+       cd $(BUILDDIR); dpkg-buildpackage -S -uc -us --build-profiles="pkg.frr.nortrlib" -d
+
+sbuild: $(DSC)
+       sbuild --profiles="pkg.frr.nortrlib" $<
+
 .PHONY: upload
+upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
 upload: $(DEBS)
-       tar cf - $(DEBS)|ssh -X repoman@repo.proxmox.com -- upload --product pve --dist bullseye
+       tar cf - $(DEBS)|ssh -X repoman@repo.proxmox.com -- upload --product pve --dist $(UPLOAD_DIST)
 
 .PHONY: distclean
 distclean: clean
 
 .PHONY: clean
 clean:
-       rm -rf *~ debian/*~ *.deb build-$(PACKAGE)* *.changes *.dsc *.buildinfo
+       rm -rf $(PACKAGE)-[0-9]*/
+       rm -rf $(PACKAGE)*.tar* *.deb *.dsc *.changes *.dsc *.buildinfo *.build
 
 .PHONY: dinstall
 dinstall: deb