summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2025-09-03 21:53:34 +0200
committerGitHub <noreply@github.com>2025-09-03 21:53:34 +0200
commit4e0ed81965f0e3efd8054ccfc0403883864696e1 (patch)
tree4131caaf76147b426b4b3bc527cbae23c2812c45
parentb1b4545cb7984cd3cdf42554ab2b28acd1ecb6cb (diff)
parent562c21cb80c150337a737894617678a09bf3a560 (diff)
downloadvyos-1x-4e0ed81965f0e3efd8054ccfc0403883864696e1.tar.gz
vyos-1x-4e0ed81965f0e3efd8054ccfc0403883864696e1.zip
Merge pull request #4694 from c-po/add-version-commit-count
Debian: T7762: extend package version with a number always counting up
-rwxr-xr-xdebian/rules3
1 files changed, 2 insertions, 1 deletions
diff --git a/debian/rules b/debian/rules
index 69483e5fd..83091a88a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,7 @@ DEB_TARGET_ARCH := $(shell dpkg-architecture -qDEB_TARGET_ARCH)
# Base version prefix from debian/changelog
BASE_VERSION := 999.0
COMMIT_ID := $(shell echo -n g && git rev-parse --short HEAD)
+COMMIT_COUNT := $(shell git rev-list HEAD --count)
DIRTY_FLAG := $(shell ! git diff --quiet || ! git diff --cached --quiet && echo -dirty || echo)
%:
@@ -32,7 +33,7 @@ DIRTY_FLAG := $(shell ! git diff --quiet || ! git diff --cached --quiet && echo
override_dh_strip_nondeterminism:
override_dh_gencontrol:
- dh_gencontrol -- -v$(BASE_VERSION)-$(COMMIT_ID)$(DIRTY_FLAG)
+ dh_gencontrol -- -v$(BASE_VERSION)-$(COMMIT_COUNT)-$(COMMIT_ID)$(DIRTY_FLAG)
override_dh_auto_build:
make all