summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-09-11 07:23:54 +0200
committerChristian Breunig <christian@breunig.cc>2023-09-11 07:24:57 +0200
commit0006a5c453f123d37d630c018abf8c7477f80198 (patch)
treedf5ad5481b32fab87fe06f1875cf2dd2a6451f48 /packages
parenta9383c0b07ded3eef82bc8b3d9329ec0eaae4f7d (diff)
downloadvyos-build-0006a5c453f123d37d630c018abf8c7477f80198.tar.gz
vyos-build-0006a5c453f123d37d630c018abf8c7477f80198.zip
frr: fix build script to only rely on annotated tags
A recent added FRR tag base_fuzz_20230907 made the builds fail. Change "git describe" command to only account annotated release tags. (cherry picked from commit 0f75e12dd1af2f24216b95d29edeb02be0a62aaf)
Diffstat (limited to 'packages')
-rwxr-xr-xpackages/frr/build-frr.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/frr/build-frr.sh b/packages/frr/build-frr.sh
index 477ff734..e03f54ba 100755
--- a/packages/frr/build-frr.sh
+++ b/packages/frr/build-frr.sh
@@ -32,5 +32,5 @@ fi
# Build Debian FRR package
echo "I: Build Debian FRR Package"
# extract "real" git commit for FRR version identifier
-dch -v "$(git describe --tags | cut -c5-)" "VyOS build - FRR"
+dch -v "$(git describe | cut -c5-)" "VyOS build - FRR"
dpkg-buildpackage -us -uc -tc -b -Ppkg.frr.rtrlib