diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-08-28 17:03:30 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2025-08-28 17:08:23 +0200 |
| commit | 53d8ed6cc01ebe31ca911e1ac6b4f4b46ea44940 (patch) | |
| tree | d3d3cdaa0625b2dd8758a0e9611ab70916b75dd2 /debian | |
| parent | 968409218f914d180b2f9781edf3423ddb8ac738 (diff) | |
| download | vyos-1x-53d8ed6cc01ebe31ca911e1ac6b4f4b46ea44940.tar.gz vyos-1x-53d8ed6cc01ebe31ca911e1ac6b4f4b46ea44940.zip | |
Debian: T7762: adjust vyos-1x package version to not mention 1.5 in any way
We've always used 999 as a kind of special super development version. Right now
when a vyos-1x package is build from the current branch it's named like:
vyos-1x_1.5dev0-3578-g2f1d1d343_all.deb
marking the 3578th commit after tag 1.5dev0 was created ad some random point in
time. The current Git repo commit id is 2f1d1d343.
To clearly unbind this from the 1.4, 1.5 and rolling development branch the
naming scheme of the package should be changed to:
vyos-1x_999.0-g5c03a86c0_amd64.deb
marking it a development package build from Git (g) from commit 5c03a86c0
-rw-r--r-- 1 vyos vyos 11922 Aug 28 17:06 vyos-1x_999.0_amd64.buildinfo
-rw-r--r-- 1 vyos vyos 2820 Aug 28 17:06 vyos-1x_999.0_amd64.changes
-rw-r--r-- 1 vyos vyos 2129880 Aug 28 17:06 vyos-1x_999.0-g5c03a86c0_amd64.deb
-rw-r--r-- 1 vyos vyos 5020 Aug 28 17:06 vyos-1x-aws_999.0-g5c03a86c0_all.deb
-rw-r--r-- 1 vyos vyos 2680 Aug 28 17:06 vyos-1x-dbgsym_999.0-g5c03a86c0_amd64.deb
-rw-r--r-- 1 vyos vyos 236228 Aug 28 17:06 vyos-1x-smoketest_999.0-g5c03a86c0_all.deb
-rw-r--r-- 1 vyos vyos 3216 Aug 28 17:06 vyos-1x-vmware_999.0-g5c03a86c0_all.deb
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | debian/rules | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index d64c66818..68aeecac3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -vyos-1x (1.5dev0) unstable; urgency=medium +vyos-1x (999.0) unstable; urgency=medium * Dummy changelog entry for vyos-1x repository This is a internal VyOS package and the VyOS package process does not use diff --git a/debian/rules b/debian/rules index 7341bb15a..69483e5fd 100755 --- a/debian/rules +++ b/debian/rules @@ -19,6 +19,11 @@ SERVICES_DIR := usr/libexec/vyos/services 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) +DIRTY_FLAG := $(shell ! git diff --quiet || ! git diff --cached --quiet && echo -dirty || echo) + %: dh $@ --with python3, --with quilt @@ -27,7 +32,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/*' --match '1.4.*' --dirty 2>/dev/null || echo 0.0-no.git.tag) | sed -E 's%vyos/%%' | sed -E 's%-dirty%+dirty%') + dh_gencontrol -- -v$(BASE_VERSION)-$(COMMIT_ID)$(DIRTY_FLAG) override_dh_auto_build: make all |