summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-01-19 20:02:05 +0100
committerChristian Breunig <christian@breunig.cc>2024-01-19 20:06:26 +0100
commit5c6d4b17d90cdfdf1541d81fb081575c54b168a7 (patch)
treef821bba2fbf8f5f1e06b2ac1bc00d3da5d66b4ae
parent9c6aed53c68b8b5d62223717b71f8e41b70b78cc (diff)
downloadvyos-1x-5c6d4b17d90cdfdf1541d81fb081575c54b168a7.tar.gz
vyos-1x-5c6d4b17d90cdfdf1541d81fb081575c54b168a7.zip
Debian: T2267: extend version tag from GIT repo
This extends commit 2c3e4696b3e22 ("T2267: Versioning: Update version tag from GIT repo") to also include release tags. (cherry picked from commit 04aa70e3f75169fc592b20acfa6e0b2f37d90a6c)
-rwxr-xr-xdebian/rules2
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/rules b/debian/rules
index e6bbeeafb..09c0a720a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@ DEB_TARGET_ARCH := $(shell dpkg-architecture -qDEB_TARGET_ARCH)
override_dh_strip_nondeterminism:
override_dh_gencontrol:
- dh_gencontrol -- -v$(shell (git describe --tags --long --match 'vyos/*' --dirty 2>/dev/null || echo 0.0-no.git.tag) | sed -E 's%vyos/%%' | sed -E 's%-dirty%+dirty%')
+ dh_gencontrol -- -v$(shell (git describe --tags --long --match 'vyos/*' --match '1.4.*' --dirty 2>/dev/null || echo 0.0-no.git.tag) | sed -E 's%vyos/%%' | sed -E 's%-dirty%+dirty%')
override_dh_auto_build:
make all