diff options
| author | Scott Moser <smoser@ubuntu.com> | 2018-05-22 16:06:41 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2018-05-22 16:06:41 -0400 |
| commit | 5446c788160412189200c6cc688b14c9f9071943 (patch) | |
| tree | 4fc9a16dd57028a2adbca4cf35acbccae13d7f1e /packages | |
| parent | 529d48f69d3784b2314397f5eab9d750ab03cf6a (diff) | |
| download | vyos-cloud-init-5446c788160412189200c6cc688b14c9f9071943.tar.gz vyos-cloud-init-5446c788160412189200c6cc688b14c9f9071943.zip | |
Update version.version_string to contain packaged version.
This modifies version.version_string to support having the package
build write the *packaged* version in with a easy replace.
Then, when cloud-init reports its version it will include the full
packaged version.
Also modified here are upstream package build files to get that done.
Note part of the trickery in packages/debian/rules.in was to avoid
the 'basic' templater consuming the '$variable' variable names.
LP: #1770712
Diffstat (limited to 'packages')
| -rwxr-xr-x | packages/debian/rules.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/debian/rules.in b/packages/debian/rules.in index 4aa907e3..e542c7f1 100755 --- a/packages/debian/rules.in +++ b/packages/debian/rules.in @@ -3,6 +3,7 @@ INIT_SYSTEM ?= systemd export PYBUILD_INSTALL_ARGS=--init-system=$(INIT_SYSTEM) PYVER ?= python${pyver} +DEB_VERSION := $(shell dpkg-parsechangelog --show-field=Version) %: dh $@ --with $(PYVER),systemd --buildsystem pybuild @@ -14,6 +15,7 @@ override_dh_install: cp tools/21-cloudinit.conf debian/cloud-init/etc/rsyslog.d/21-cloudinit.conf install -D ./tools/Z99-cloud-locale-test.sh debian/cloud-init/etc/profile.d/Z99-cloud-locale-test.sh install -D ./tools/Z99-cloudinit-warnings.sh debian/cloud-init/etc/profile.d/Z99-cloudinit-warnings.sh + flist=$$(find $(CURDIR)/debian/ -type f -name version.py) && sed -i 's,@@PACKAGED_VERSION@@,$(DEB_VERSION),' $${flist:-did-not-find-version-py-for-replacement} override_dh_auto_test: ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) |