diff options
| author | Martin Winter <mwinter@opensourcerouting.org> | 2017-06-13 18:06:14 -0700 |
|---|---|---|
| committer | Martin Winter <mwinter@opensourcerouting.org> | 2017-11-17 17:55:31 -0800 |
| commit | 5eee7099c8a0fc3f304c6f8568a27c5c5c965109 (patch) | |
| tree | 97080e769695e3bcce7b2dedf87526dadafa3981 | |
| parent | 7dc9a3051385138f69d5e05015ea71c92ccc3853 (diff) | |
debianpkg: Support --with-pkg-extra-version and other modifier to build custom package version
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
| -rwxr-xr-x | configure.ac | 1 | ||||
| -rw-r--r-- | debianpkg/changelog.in (renamed from debianpkg/changelog) | 6 | ||||
| -rwxr-xr-x | debianpkg/rules | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 35577ab119..6c73391afa 100755 --- a/configure.ac +++ b/configure.ac @@ -1840,6 +1840,7 @@ AC_CONFIG_FILES([Makefile bgpd/rfp-example/rfptest/Makefile bgpd/rfp-example/librfp/Makefile redhat/frr.spec debianpkg/Makefile + debianpkg/changelog snapcraft/snapcraft.yaml lib/version.h tests/lib/cli/test_cli.refout diff --git a/debianpkg/changelog b/debianpkg/changelog.in index d86a1a761a..4002f7e14d 100644 --- a/debianpkg/changelog +++ b/debianpkg/changelog.in @@ -1,10 +1,10 @@ -frr (3.1-dev) Released; urgency=medium +frr (@VERSION@) RELEASED; urgency=medium * New Enabled: PIM draft Unnumbered -- FRRouting-Dev <dev@lists.frrouting.org> Wed, 18 Oct 2017 17:01:42 -0700 -frr (3.0-0) Released; urgency=medium +frr (3.0-0) RELEASED; urgency=medium * New Enabled: BGP Shutdown Message * New Enabled: BGP Large Community @@ -25,7 +25,7 @@ frr (3.0-0) Released; urgency=medium -- FRRouting-Dev <dev@lists.frrouting.org> Wed, 05 Apr 2017 22:23:42 -0500 -frr (2.0-0) Released; urgency=medium +frr (2.0-0) RELEASED; urgency=medium * Switchover to FRR diff --git a/debianpkg/rules b/debianpkg/rules index 3d84a37d39..75d4cb14b2 100755 --- a/debianpkg/rules +++ b/debianpkg/rules @@ -197,11 +197,10 @@ override_dh_systemd_enable: # backports SRCPKG = frr KNOWN_BACKPORTS = debian8 ubuntu12.04 ubuntu14.04 ubuntu16.04 -ORIG_VERSION := $(shell dh_testdir && grep -E < configure.ac '^AC_INIT\(.*\)' \ - | cut -d, -f2 | xargs echo) DEBIAN_VERSION := $(shell dh_testdir && \ dpkg-parsechangelog -c1 < debian/changelog | \ sed -rn 's/^Version: ?//p') +ORIG_VERSION := $(DEBIAN_VERSION) -include debian/backports/rules ifneq ($(TARBALLDIR),) |