bump version to 8.5.2-1+pve1

[frr.git] / Makefile

diff --git a/Makefile b/Makefile
index 77ce2282667c0f97da618785bfa10375484b60db..696a5b77e60f30b921326662b8f12e9d6be395b9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,44 +1,77 @@
+include /usr/share/dpkg/default.mk
+
 PACKAGE=frr
-VER=7.2
-PKGREL=1+pve
 
 SRCDIR=frr
-BUILDDIR=${SRCDIR}.tmp
+BUILDDIR=$(PACKAGE)-$(DEB_VERSION_UPSTREAM)
+
+ORIG_SRC_TAR=$(PACKAGE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz
+DSC=$(PACKAGE)_$(DEB_VERSION).dsc
 
-ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+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_HOST_ARCH).deb \
 
-GITVERSION:=$(shell git rev-parse HEAD)
+DBG_DEBS=\
+  frr-dbgsym_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb \
+  frr-snmp-dbgsym_$(DEB_VERSION)_$(DEB_HOST_ARCH).deb \
 
-DEB=${PACKAGE}_${VER}-${PKGREL}_${ARCH}.deb
+DEBS=$(MAIN_DEB) $(OTHER_DEBS) $(DBG_DEBS)
 
-all: ${DEB}
-       @echo ${DEB}
+all: $(DEBS)
+       @echo $(DEBS)
 
 .PHONY: submodule
 submodule:
-       test -f "${SRCDIR}/debian/changelog" || git submodule update --init
+       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 $@ $@.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: ${DEB}
-${DEB}: | submodule
-       rm -f *.deb
-       rm -rf $(BUILDDIR)
-       cp -rpa ${SRCDIR} ${BUILDDIR}
-       rm $(BUILDDIR)/debian/changelog
-       cp -R debian/* $(BUILDDIR)/debian/
-       cd ${BUILDDIR};  DEB_BUILD_PROFILES=pkg.frr.nortrlib dpkg-buildpackage -rfakeroot -b -uc -us
+deb: $(DEBS)
+$(OTHER_DEBS) $(DBG_DEBS): $(MAIN_DEB)
+$(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: ${DEB}
-       tar cf - ${DEB}|ssh -X repoman@repo.proxmox.com -- upload --product pmg,pve --dist stretch
+upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
+upload: $(DEBS)
+       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 ${BUILDDIR} *.changes *.dsc *.buildinfo
+       rm -rf $(PACKAGE)-[0-9]*/
+       rm -rf $(PACKAGE)*.tar* *.deb *.dsc *.changes *.dsc *.buildinfo *.build
 
 .PHONY: dinstall
 dinstall: deb
-       dpkg -i ${DEB}
+       dpkg -i $(DEBS)