From 7fb434ef85846a9c893cf5d428b19150467892dd Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Fri, 17 Jan 2020 15:53:47 +0100 Subject: [PATCH] build: fix auto git ID length This script was written back when `git describe` would abbreviate to 7-char commit IDs; they're longer now and we're grabbing the tail end... Signed-off-by: David Lamparter --- lib/gitversion.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gitversion.pl b/lib/gitversion.pl index 2718046d0b..dd25c8976a 100644 --- a/lib/gitversion.pl +++ b/lib/gitversion.pl @@ -6,7 +6,7 @@ chdir $dir || die "$dir: $!\n"; 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"; +my $gitsuffix = ($gitdesc =~ /-g([0-9a-fA-F]+(-dirty)?)$/) ? "-g$1" : "-gUNKNOWN"; printf STDERR "git suffix: %s\n", $gitsuffix; printf "#define GIT_SUFFIX \"%s\"\n", $gitsuffix;