From: David Lamparter <equinox@opensourcerouting.org>
Date: Thu, 1 Jun 2017 14:16:07 +0000 (+0200)
Subject: build: make gitversion more useful
X-Git-Tag: frr-4.0-dev~435^2~16
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=181d61462b93c3f3100dab0c2d2ee97d4bd41692;p=matthieu%2Ffrr.git

build: make gitversion more useful

Use --first-parent (i.e. mainline side of merge) and restrict to "frr-"
tags.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---

diff --git a/lib/gitversion.pl b/lib/gitversion.pl
index 8ddd9ffa55..2718046d0b 100644
--- a/lib/gitversion.pl
+++ b/lib/gitversion.pl
@@ -4,7 +4,7 @@ use strict;
 my $dir = shift;
 chdir $dir || die "$dir: $!\n";
 
-my $gitdesc = `git describe --always --dirty || echo -- \"0-gUNKNOWN\"`;
+my $gitdesc = `git describe --always --first-parent --tags --dirty --match 'frr-*' || echo -- \"0-gUNKNOWN\"`;
 chomp $gitdesc;
 my $gitsuffix = ($gitdesc =~ /([0-9a-fA-F]{7}(-dirty)?)$/) ? "-g$1" : "-gUNKNOWN";