From: David Lamparter <equinox@opensourcerouting.org>
Date: Wed, 27 Feb 2013 10:24:24 +0000 (+0100)
Subject: build: fix minimal mixup in gitinfo suffix
X-Git-Tag: frr-2.0-rc1~1677
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=4a014580ff85428aa41b28503554b2ce982805be;p=mirror%2Ffrr.git

build: fix minimal mixup in gitinfo suffix

the original version of this had issues with tagless repositories; to
fix that I removed the "-g" part from one of the regexes.  I then failed
to add those 2 characters back, leading to version numbers like
"0.99.220123456" instead of "0.99.22-ga123456".  Let's put the "-g"
back...

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

diff --git a/lib/gitversion.pl b/lib/gitversion.pl
index 448f13d676..8ddd9ffa55 100644
--- a/lib/gitversion.pl
+++ b/lib/gitversion.pl
@@ -6,7 +6,7 @@ chdir $dir || die "$dir: $!\n";
 
 my $gitdesc = `git describe --always --dirty || echo -- \"0-gUNKNOWN\"`;
 chomp $gitdesc;
-my $gitsuffix = ($gitdesc =~ /([0-9a-fA-F]{7}(-dirty)?)$/) ? $1 : "-gUNKNOWN";
+my $gitsuffix = ($gitdesc =~ /([0-9a-fA-F]{7}(-dirty)?)$/) ? "-g$1" : "-gUNKNOWN";
 
 printf STDERR "git suffix: %s\n", $gitsuffix;
 printf "#define GIT_SUFFIX \"%s\"\n", $gitsuffix;